debian packaging update (take II on fixing #13310)

qgis · Oct 1, 2015 · e263e9e · e263e9e
1 parent 32c5f55
commit e263e9e
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 46 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -3,8 +3,10 @@ qgis (2.11.0) UNRELEASED; urgency=medium
   * New development version 2.11 after branch of 2.10
   * moved grass default.qgc from config to modules
   * include grass7 plugin
+  * move grass provider to separate package
+  * add ubuntu wily
 
- -- Jürgen E. Fischer <jef@norbit.de>  Tue, 25 Aug 2015 00:14:25 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Wed, 30 Sep 2015 14:06:10 +0200
 
 qgis (2.10.0) unstable; urgency=medium
 

diff --git a/debian/compat.in b/debian/compat.in
@@ -1,3 +1,3 @@
-#stretch sid jessie trusty utopic vivid#9
+#stretch sid jessie trusty utopic vivid wily#9
 #wheezy jessie#8
 #precise#7
diff --git a/debian/control.in b/debian/control.in
@@ -6,13 +6,13 @@ Priority: optional
 Build-Depends:
  bison,
  cmake (>= 2.8),
-#sid stretch jessie wheezy saucy trusty utopic vivid# debhelper (>= 9),
+#sid stretch jessie wheezy saucy trusty utopic vivid wily# debhelper (>= 9),
 #precise# debhelper (>= 7),
  flex,
  grass-dev,
  libexpat1-dev,
  libfcgi-dev,
-#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
+#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
 #precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
@@ -23,24 +23,27 @@ Build-Depends:
  libproj-dev,
  libqt4-dev (>= 4.7.0),
  libqt4-opengl-dev,
- libqca2-dev, libqca2-plugin-ossl,
+ libqca2-dev,
+ libqca2-plugin-ossl,
  libqtwebkit-dev,
 #stretch jessie wheezy# libqwt-dev,
-#precise saucy trusty utopic vivid stretch sid# libqwt5-qt4-dev,
+#precise saucy trusty utopic vivid wily stretch sid# libqwt5-qt4-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
  pkg-config,
  pyqt4-dev-tools,
  python-qscintilla2,
+ python-qt4 (>= 4.1.0),
+ python-qt4-dev,
+ python-qt4-sql,
 #precise saucy wheezy# python,
 #precise saucy# python-central (>= 0.5),
 #saucy wheezy# python-dev,
 #saucy# libpython2.7-dev,
-#sid stretch jessie trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
-#sid stretch jessie wheezy precise saucy trusty utopic vivid# python-qt4 (>= 4.1.0), python-qt4-dev,
+#sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
 #sid stretch jessie# pyqt4.qsci-dev,
-#sid stretch jessie trusty utopic vivid# python-pyspatialite,
+#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
 #sid stretch# dh-python,
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
@@ -57,11 +60,11 @@ Build-Depends:
  spawn-fcgi, lighttpd, poppler-utils, locales, qt4-doc-html,
  libqt4-sql-sqlite
 Build-Conflicts: libqgis-dev, qgis-dev
-#sid stretch jessie vivid#Standards-Version: 3.9.6
+#sid stretch jessie vivid wily#Standards-Version: 3.9.6
 #wheezy#Standards-Version: 3.9.3
 #precise saucy trusty utopic#Standards-Version: 3.8.4
 #sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
-#wheezy precise saucy trusty utopic vivid#XS-Python-Version: current
+#wheezy precise saucy trusty utopic vivid wily#XS-Python-Version: current
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: http://qgis.org/
@@ -218,7 +221,7 @@ Section: libdevel
 Depends:
  grass-dev,
  libexpat1-dev,
-#sid stretch jessie trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
+#sid stretch jessie trusty utopic vivid wily# libgdal-dev (>= 1.10.1-0~),
 #precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
 #saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
@@ -237,6 +240,7 @@ Depends:
  libsqlite3-dev,
  python-qt4 (>= 4.1.0),
  python-qt4-dev (>= 4.1.0),
+ python-qt4-sql,
  qt4-designer,
  ${misc:Depends}
 Recommends: libqgis-customwidgets
@@ -273,7 +277,6 @@ Description: QGIS - debugging symbols
 Package: qgis-provider-grass
 Architecture: any
 Depends:
- qgis (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
 Description: GRASS plugin for QGIS
@@ -290,8 +293,10 @@ Depends:
  qgis-provider-grass (= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
-#!precise# grass-core (<< 7)
-#precise# grass (<< 7)
+#!precise# grass-core
+#precise# grass
+Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
+Conflicts: qgis-provider-grass (<< 1:2.11.0+git20151002)
 Description: GRASS plugin for QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -343,6 +348,7 @@ Architecture: any
 Section: python
 Depends:
  python-qt4,
+ python-qt4-sql,
  python-sip,
  python-qgis-common (= ${source:Version}),
  python-psycopg2,
@@ -354,7 +360,7 @@ Depends:
  python-dateutil,
  python-tz,
  python-six,
-#sid stretch jessie trusty utopic vivid# python-pyspatialite,
+#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
 #jessie# liblwgeom-2.1.4,
 #stretch sid# liblwgeom-2.1.8,
  libqgispython{QGIS_ABI},
@@ -394,6 +400,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
  qgis-providers-common (= ${source:Version}),
  libqt4-sql-sqlite,
+ libqca2-plugin-ossl,
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: qgis (<= 1.6)

diff --git a/debian/qgis-plugin-grass.postrm b/debian/qgis-plugin-grass.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+	for i in /usr/bin/qgis /usr/bin/qbrowser; do
+		dpkg-divert --package qgis-plugin-grass --remove --rename --divert $i.bin $i
+	done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/qgis-plugin-grass.preinst b/debian/qgis-plugin-grass.preinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+pkg=qgis-plugin-grass
+
+if [ "$1" = "install" -o "$1" = "upgrade" ]; then
+        div=$(dpkg-divert --listpackage /usr/bin/qgis)
+        if [ -n "$div" -a "$div" != $pkg ]; then
+		for i in /usr/bin/qgis /usr/bin/qbrowser; do
+			if [ -e $i ] && ! [ -e $i.undiverted ]; then
+				mv $i $i.undiverted
+			fi
+			dpkg-divert --package $div --remove --rename --divert $i.bin $i
+			if [ -e $i.undiverted ]; then
+				mv $i.undiverted $i
+			fi
+		done
+	fi
+
+	for i in /usr/bin/qgis /usr/bin/qbrowser; do
+		dpkg-divert --package $pkg --add --rename --divert $i.bin $i
+	done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/qgis-provider-grass.postrm b/debian/qgis-provider-grass.postrm
diff --git a/debian/qgis-provider-grass.preinst b/debian/qgis-provider-grass.preinst
diff --git a/debian/rules b/debian/rules
@@ -29,7 +29,7 @@ ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
 	WITH_ORACLE=1
 endif
 
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie stretch precise trusty utopic vivid wily"))
 	DISTRIBUTION := sid
 endif
 
@@ -102,7 +102,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
 		      -DGEOS_CPP_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos.so
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty utopic vivid wily sid"))
 	CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
 endif
 
@@ -263,9 +263,9 @@ override_dh_auto_install:
 	$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
 
 	# qgis binary wrappers
-	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-provider-grass/usr/bin
-	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qgis
-	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-provider-grass/usr/bin/qbrowser
+	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
 
 override_dh_install:
 	# Don't ship srs.db, automatically updated in postinst with crssync