debian/changelog

@@ -1,3 +1,10 @@
+qgis (2.2.0-1) UNRELEASED; urgency=medium
+
+  * enable globe on jessie
+  * add dependency on libqt4-sql-sqlite to qgis-provider
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 23 Feb 2014 11:36:30 +0100
+
 qgis (2.2.0) UNRELEASED; urgency=medium
 
   * Release of 2.2

debian/control.jessie

@@ -172,6 +172,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.precise

@@ -157,7 +157,11 @@ Description: Python bindings to QGIS - architecture-independent files
 
 Package: qgis-providers
 Architecture: any
-Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
+ ${shlibs:Depends},
+ ${misc:Depends}
 Replaces: qgis (<= 1.6)
 Breaks: qgis (<= 1.6)
 Description: collection of data providers to QGIS

debian/control.quantal

@@ -174,6 +174,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.raring

@@ -174,6 +174,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.saucy

@@ -172,6 +172,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.sid

@@ -172,6 +172,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.sid-oracle

@@ -173,6 +173,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.trusty

@@ -170,6 +170,7 @@ Package: qgis-providers
 Architecture: any
 Depends:
  qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: qgis (<= 1.6)

debian/control.wheezy

@@ -156,7 +156,11 @@ Description: Python bindings to QGIS - architecture-independent files
 
 Package: qgis-providers
 Architecture: any
-Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ qgis-providers-common (= ${source:Version}),
+ libqt4-sql-sqlite,
+ ${shlibs:Depends},
+ ${misc:Depends}
 Replaces: qgis (<= 1.6)
 Breaks: qgis (<= 1.6)
 Description: collection of data providers to QGIS

debian/rules

@@ -47,7 +47,8 @@ CMAKE_OPTS := \
 	-D WITH_MAPSERVER=TRUE \
 	-D MAPSERVER_SKIP_ECW=TRUE \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-	-D WITH_APIDOC=TRUE
+	-D WITH_APIDOC=TRUE \
+	-D WITH_GLOBE=TRUE
 
 MAKEFLAGS += VERBOSE=YES
 
@@ -61,11 +62,6 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise raring saucy tru
 	CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"jessie"))
-	CMAKE_OPTS += -D WITH_GLOBE=FALSE
-else
-	CMAKE_OPTS += -D WITH_GLOBE=TRUE
-endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"jessie raring saucy trusty sid sid-oracle"))
 	CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so

src/app/qgsmaptoolidentifyaction.cpp

@@ -102,9 +102,10 @@ void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )
 
   if ( !results.isEmpty() )
   {
-    // Show the dialog before items are inserted so that items can resize themselfs
+    // Show the dialog before items are inserted so that items can resize themselves
     // according to dialog size also the first time, see also #9377
-    resultsDialog()->QDialog::show();
+    if( results.size() != 1 || !QSettings().value( "/Map/identifyAutoFeatureForm", false ).toBool() )
+      resultsDialog()->QDialog::show();
 
     QList<IdentifyResult>::const_iterator result;
     for ( result = results.begin(); result != results.end(); ++result )

src/providers/oracle/qgsoracleprovider.cpp

@@ -706,7 +706,7 @@ bool QgsOracleProvider::loadFields()
     mEnabledCapabilities |= QgsVectorDataProvider::CreateSpatialIndex;
   }
 
-  if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )
+  if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )
   {
     QgsMessageLog::logMessage( tr( "Retrieving fields from '%1' failed [%2]" ).arg( mQuery ).arg( qry.lastError().text() ), tr( "Oracle" ) );
     return false;
@@ -835,7 +835,7 @@ bool QgsOracleProvider::hasSufficientPermsAndCapabilities()
              .arg( mQuery )
              .arg( quotedIdentifier( alias ) );
 
-    if ( !exec( qry, QString( "SELECT * FROM %1 WHERE rownum=0" ).arg( mQuery ) ) )
+    if ( !exec( qry, QString( "SELECT * FROM %1 WHERE 1=0" ).arg( mQuery ) ) )
     {
       QgsMessageLog::logMessage( tr( "Unable to execute the query.\nThe error message from the database was:\n%1.\nSQL: %2" )
                                  .arg( qry.lastError().text() )
@@ -1906,7 +1906,7 @@ bool QgsOracleProvider::setSubsetString( QString theSQL, bool updateFeatureCount
     sql += "(" + mSqlWhereClause + ") AND ";
   }
 
-  sql += "rownum=0";
+  sql += "1=0";
 
   QSqlQuery qry( *mConnection );
   if ( !exec( qry, sql ) )
@@ -2074,7 +2074,7 @@ bool QgsOracleProvider::getGeometryDetails()
   QSqlQuery qry( *mConnection );
   if ( mIsQuery )
   {
-    if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE rownum=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )
+    if ( !exec( qry, QString( "SELECT %1 FROM %2 WHERE 1=0" ).arg( quotedIdentifier( mGeometryColumn ) ).arg( mQuery ) ) )
     {
       QgsMessageLog::logMessage( tr( "Could not execute query.\nThe error message from the database was:\n%1.\nSQL: %2" )
                                  .arg( qry.lastError().text() )