debian packaging fixes

* enable globe on jessie * add dependency on libqt4-sql-sqlite to qgis-provider (fixes #8662)
qgis · Feb 23, 2014 · 3f6543d · 3f6543d
1 parent f02591a
commit 3f6543d
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 9 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,10 @@
 qgis (2.3.0) UNRELEASED; urgency=medium
 
   * New development version 2.3 after branch of 2.2
+  * enable globe on jessie
+  * add dependency on libqt4-sql-sqlite to qgis-provider
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 22 Feb 2014 09:49:29 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 23 Feb 2014 11:36:30 +0100
 
 qgis (2.2.0) unstable; urgency=medium
 

diff --git a/debian/control.jessie b/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)

diff --git a/debian/control.precise b/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

diff --git a/debian/control.quantal b/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)

diff --git a/debian/control.raring b/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)

diff --git a/debian/control.saucy b/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)

diff --git a/debian/control.sid b/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)

diff --git a/debian/control.sid-oracle b/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)

diff --git a/debian/control.trusty b/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)

diff --git a/debian/control.wheezy b/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

diff --git a/debian/rules b/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