Author: jef
Date: 2010-12-15 17:20:05 -0800 (Wed, 15 Dec 2010)
New Revision: 14924
Added:
trunk/qgis/debian/qgis-sqlanywhere{QGIS_ABI}.install
Modified:
trunk/qgis/debian/changelog
trunk/qgis/debian/control.lenny
trunk/qgis/debian/control.lucid
trunk/qgis/debian/control.maverick
trunk/qgis/debian/control.natty
trunk/qgis/debian/control.squeeze
trunk/qgis/debian/qgis-providers.install
trunk/qgis/debian/qgis.install
trunk/qgis/src/analysis/raster/qgsrastercalclexer.ll
trunk/qgis/src/app/composer/qgscomposer.cpp
trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
Log:
debian packaging fix: separate sql anywhere package, fix lenny build (Qt<4.5)
Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/changelog 2010-12-16 01:20:05 UTC (rev 14924)
@@ -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 at norbit.de> Wed, 15 Dec 2010 23:49:44 +0100
+ -- Jürgen E. Fischer <jef at norbit.de> Thu, 16 Dec 2010 02:08:04 +0100
qgis (1.6.0) UNRELEASED; urgency=low
Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/control.lenny 2010-12-16 01:20:05 UTC (rev 14924)
@@ -172,3 +172,12 @@
.
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.
+
Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/control.lucid 2010-12-16 01:20:05 UTC (rev 14924)
@@ -173,3 +173,12 @@
.
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.
+
Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/control.maverick 2010-12-16 01:20:05 UTC (rev 14924)
@@ -174,3 +174,12 @@
.
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.
+
Modified: trunk/qgis/debian/control.natty
===================================================================
--- trunk/qgis/debian/control.natty 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/control.natty 2010-12-16 01:20:05 UTC (rev 14924)
@@ -174,3 +174,12 @@
.
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.
+
Modified: trunk/qgis/debian/control.squeeze
===================================================================
--- trunk/qgis/debian/control.squeeze 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/control.squeeze 2010-12-16 01:20:05 UTC (rev 14924)
@@ -173,3 +173,12 @@
.
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.
+
Modified: trunk/qgis/debian/qgis-providers.install
===================================================================
--- trunk/qgis/debian/qgis-providers.install 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/qgis-providers.install 2010-12-16 01:20:05 UTC (rev 14924)
@@ -7,4 +7,3 @@
usr/lib/qgis/plugins/libmemoryprovider.so
usr/lib/qgis/plugins/libspatialiteprovider.so
usr/lib/qgis/plugins/libosmprovider.so
-usr/lib/qgis/plugins/libsqlanywhereprovider.so
Added: trunk/qgis/debian/qgis-sqlanywhere{QGIS_ABI}.install
===================================================================
--- trunk/qgis/debian/qgis-sqlanywhere{QGIS_ABI}.install (rev 0)
+++ trunk/qgis/debian/qgis-sqlanywhere{QGIS_ABI}.install 2010-12-16 01:20:05 UTC (rev 14924)
@@ -0,0 +1,3 @@
+usr/lib/qgis/plugins/libsqlanywhereplugin.so
+usr/lib/qgis/plugins/libsqlanywhereprovider.so
+usr/lib/libsqlanyconnection.so.{QGIS_ABI}
Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/debian/qgis.install 2010-12-16 01:20:05 UTC (rev 14924)
@@ -19,7 +19,6 @@
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
Modified: trunk/qgis/src/analysis/raster/qgsrastercalclexer.ll
===================================================================
--- trunk/qgis/src/analysis/raster/qgsrastercalclexer.ll 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/src/analysis/raster/qgsrastercalclexer.ll 2010-12-16 01:20:05 UTC (rev 14924)
@@ -17,6 +17,7 @@
***************************************************************************/
%option noyywrap
+%option nounput
%option case-insensitive
%option never-interactive
Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp 2010-12-16 01:20:05 UTC (rev 14924)
@@ -818,7 +818,9 @@
//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 );
Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.cpp 2010-12-16 01:20:05 UTC (rev 14924)
@@ -26,6 +26,10 @@
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" ) ) );
Modified: trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2010-12-15 23:45:54 UTC (rev 14923)
+++ trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2010-12-16 01:20:05 UTC (rev 14924)
@@ -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">