Skip to content
Permalink
Browse files
debian packaging fix: separate sql anywhere package, fix lenny build …
…(Qt<4.5)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14924 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 16, 2010
1 parent 88c72fe commit 53cf3a30762822530cad8ef5bd0419417e15af7b
@@ -1,9 +1,9 @@
qgis (1.7.0) UNRELEASED; urgency=low

* new development version after 1.7 branch
* include sql anywhere plugin
* add qgis-sqlanywhere1.7.0 package

-- J�rgen E. Fischer <jef@norbit.de> Wed, 15 Dec 2010 23:49:44 +0100
-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 Dec 2010 02:08:04 +0100

qgis (1.6.0) UNRELEASED; urgency=low

@@ -172,3 +172,12 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

@@ -173,3 +173,12 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

@@ -174,3 +174,12 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

@@ -174,3 +174,12 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

@@ -173,3 +173,12 @@ Description: Quantum GIS mapserver
.
This package contains the Quantum GIS mapserver.

Package: qgis-sqlanywhere{QGIS_ABI}
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Quantum GIS sql anywhere plugin and provider
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
.
This package contains the Quantum GIS sqlanywhere plugin and provider.

@@ -7,4 +7,3 @@ usr/lib/qgis/plugins/libwmsprovider.so
usr/lib/qgis/plugins/libmemoryprovider.so
usr/lib/qgis/plugins/libspatialiteprovider.so
usr/lib/qgis/plugins/libosmprovider.so
usr/lib/qgis/plugins/libsqlanywhereprovider.so
@@ -0,0 +1,3 @@
usr/lib/qgis/plugins/libsqlanywhereplugin.so
usr/lib/qgis/plugins/libsqlanywhereprovider.so
usr/lib/libsqlanyconnection.so.{QGIS_ABI}
@@ -19,7 +19,6 @@ usr/lib/qgis/plugins/librasterterrainplugin.so
usr/lib/qgis/plugins/libspatialqueryplugin.so
usr/lib/qgis/plugins/libdisplacementplugin.so
usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libsqlanywhereplugin.so
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
@@ -17,6 +17,7 @@
***************************************************************************/

%option noyywrap
%option nounput
%option case-insensitive
%option never-interactive

@@ -818,7 +818,9 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
//height in pixel
int height = ( int )( mComposition->paperHeight() * mComposition->printResolution() / 25.4 );
generator.setSize( QSize( width, height ) );
#if QT_VERSION >= 0x040500
generator.setViewBox( QRect( 0, 0, width, height ) );
#endif
generator.setResolution( mComposition->printResolution() ); //because the rendering is done in mm, convert the dpi

QPainter p( &generator );
@@ -26,6 +26,10 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa

setupUi( this );

#if QT_VERSION >= 0x40500
tabItemType->setDocumentMode( true );
#endif

// setup icons
btnAddItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
btnEditItem->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) );
@@ -31,9 +31,6 @@
<height>22</height>
</size>
</property>
<property name="documentMode">
<bool>true</bool>
</property>
<widget class="QWidget" name="tabMarker">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">

0 comments on commit 53cf3a3

Please sign in to comment.