debian packaging update

qgis · Jul 15, 2014 · 21420c6 · 21420c6
1 parent 6f3cea1
commit 21420c6
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 38 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -3,8 +3,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium
   * New development version 2.5 after branch of 2.4
   * add libqscintilla2-dev as build dependency
   * add remove sqlanywhere plugin and provider
+  * drop support for ubuntu quantal and raring and add utopic
 
- -- Jürgen E. Fischer <jef@norbit.de>  Tue, 08 Jul 2014 08:32:40 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Tue, 15 Jul 2014 09:09:52 +0200
 
 qgis (2.4.0) unstable; urgency=medium
 

diff --git a/debian/compat.in b/debian/compat.in
@@ -1,3 +1,3 @@
-#sid jessie sid-oracle#9
-#wheezy quantal jessie#8
-#trusty saucy raring precise#7
+#sid jessie sid-oracle saucy trusty utopic#9
+#wheezy jessie#8
+#precise#7
diff --git a/debian/control.in b/debian/control.in
@@ -6,15 +6,15 @@ Priority: optional
 Build-Depends:
  bison,
  cmake (>= 2.8),
-#sid jessie wheezy quantal raring saucy sid-oracle trusty# debhelper (>= 9),
+#sid jessie wheezy saucy sid-oracle trusty utopic# debhelper (>= 9),
 #precise# debhelper (>= 7),
  flex,
  grass-dev,
  libexpat1-dev,
  libfcgi-dev,
-#sid jessie sid-oracle trusty# libgdal-dev (>= 1.10.1-0~),
+#sid jessie sid-oracle trusty utopic# libgdal-dev (>= 1.10.1-0~),
 #precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
-#quantal raring saucy# libgdal-dev (>= 1.9.0),
+#saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
@@ -23,20 +23,19 @@ Build-Depends:
  libqt4-dev (>= 4.7.0),
  libqt4-opengl-dev,
  libqtwebkit-dev,
-#sid jessie wheezy quantal sid-oracle# libqwt-dev,
-#precise raring saucy trusty# libqwt5-qt4-dev,
+#sid jessie wheezy sid-oracle# libqwt-dev,
+#precise saucy trusty utopic# libqwt5-qt4-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
  pkg-config,
  pyqt4-dev-tools,
-#precise quantal raring saucy wheezy# python,
-#precise raring saucy# python-central (>=0.5),
-#raring saucy wheezy# python-dev,
-#raring saucy# libpython2.7-dev,
-#quantal# python-dev (>= 2.6.6-3~),
-#sid jessie sid-oracle trusty# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
-#sid jessie wheezy precise quantal raring saucy sid-oracle trusty# python-qt4 (>= 4.1.0), python-qt4-dev,
+#precise saucy wheezy# python,
+#precise saucy# python-central (>=0.5),
+#saucy wheezy# python-dev,
+#saucy# libpython2.7-dev,
+#sid jessie sid-oracle trusty utopic# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
+#sid jessie wheezy precise saucy sid-oracle trusty utopic# python-qt4 (>= 4.1.0), python-qt4-dev,
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
  libosgearth-dev,
@@ -52,10 +51,10 @@ Build-Depends:
  spawn-fcgi, lighttpd, poppler-utils
 Build-Conflicts: libqgis-dev, qgis-dev
 #sid jessie sid-oracle#Standards-Version: 3.9.5
-#wheezy quantal#Standards-Version: 3.9.3
-#precise raring saucy trusty#Standards-Version: 3.8.4
+#wheezy#Standards-Version: 3.9.3
+#precise saucy trusty utopic#Standards-Version: 3.8.4
 #sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
-#wheezy precise quantal raring saucy trusty#XS-Python-Version: current
+#wheezy precise saucy trusty utopic#XS-Python-Version: current
 Vcs-Browser: https://github.com/qgis/QGIS/
 Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: http://qgis.org/
@@ -177,9 +176,9 @@ Section: libdevel
 Depends:
  grass-dev,
  libexpat1-dev,
-#sid jessie sid-oracle trusty# libgdal-dev (>= 1.10.1-0~),
+#sid jessie sid-oracle trusty utopic# libgdal-dev (>= 1.10.1-0~),
 #precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
-#quantal raring saucy# libgdal-dev (>= 1.9.0),
+#saucy# libgdal-dev (>= 1.9.0),
 #wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
@@ -254,14 +253,14 @@ Depends:
  python-dateutil,
  python-tz,
  python-six,
-#sid jessie quantal trusty sid-oracle# python-pyspatialite,
+#sid jessie trusty utopic sid-oracle# python-pyspatialite,
  libqgispython{QGIS_ABI},
  ${shlibs:Depends},
  ${python:Depends},
  ${misc:Depends},
  ${sip:Depends}
 Provides: ${python:Provides}
-#wheezy precise quantal raring#XB-Python-Version: ${python:Versions}
+#wheezy precise#XB-Python-Version: ${python:Versions}
 Description: Python bindings to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.

diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -4,5 +4,5 @@ usr/lib/python*/*-packages/qgis/core/*
 usr/lib/python*/*-packages/qgis/gui/*
 usr/lib/python*/*-packages/qgis/analysis/*
 usr/lib/python*/*-packages/qgis/networkanalysis/*
-#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.py
-#wheezy precise quantal raring saucy#usr/lib/python*/*-packages/pyspatialite/*.so
+#wheezy precise saucy#usr/lib/python*/*-packages/pyspatialite/*.py
+#wheezy precise saucy#usr/lib/python*/*-packages/pyspatialite/*.so
diff --git a/debian/rules b/debian/rules
@@ -23,7 +23,7 @@ ifeq (,$(DISTRIBUTION))
 	DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
 endif
 
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie precise quantal raring saucy trusty sid-oracle"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"wheezy jessie precise saucy trusty utopic sid-oracle"))
 	DISTRIBUTION := sid
 endif
 
@@ -69,15 +69,15 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise quantal raring saucy"))
+ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise saucy"))
 	CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"sid sid-oracle"))
 	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"jessie raring saucy trusty sid sid-oracle"))
+ifneq (,$(findstring $(DISTRIBUTION),"jessie saucy trusty utopic sid sid-oracle"))
 	CMAKE_OPTS += -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
 endif
 

diff --git a/doc/linux.t2t b/doc/linux.t2t
@@ -44,13 +44,13 @@ sudo apt-get update
 == Install build dependencies ==
 
 || Distribution | install command for packages |
-| precise | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-| quantal | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-| raring | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-| saucy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-| wheezy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
-| jessie | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
-| sid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python-all python-all-dev python-qt4 python-qt4-dev python-sip python-sip-dev txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| wheezy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| jessie | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| precise | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| saucy | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libpython2.7-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| trusty | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| utopic | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt5-qt4-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
+| sid | ``apt-get install bison cmake doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl0-dev libopenscenegraph-dev libosgearth-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python-all python-all-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb`` |
 
 (extracted from the respective control files in ``debian/``)
 

diff --git a/scripts/scandeps.pl b/scripts/scandeps.pl
@@ -17,6 +17,22 @@
 use strict;
 use warnings;
 
+my @dists;
+open I, "debian/rules";
+while(<I>) {
+	if( /ifneq \(\$\(DISTRIBUTION\),\$\(findstring \$\(DISTRIBUTION\),"(.*)"\)\)/ ) {
+		for my $d (split / /, $1) {
+			next if $d =~ /oracle/;
+			push @dists, $d;
+		}
+		push @dists, "sid";
+		last;
+	}
+}
+close I;
+
+die "no dists" unless @dists;
+
 open I, "doc/linux.t2t";
 open O, ">doc/linux.t2t.new";
 while(<I>) {
@@ -26,10 +42,11 @@
 
 print O "|| Distribution | install command for packages |\n";
 
-for my $c (<debian/control.*>) {
-	my ($dist) = $c =~ /^.*\/control\.(.*)$/;
+for my $dist (@dists) {
+	system("git checkout debian/control" )==0 or die "git checkout failed: $!";
+	system("make -f debian/rules DISTRIBUTION=$dist cleantemplates templates" )==0 or die "make failed: $!";
 
-	open F, $c;
+	open F, "debian/control";
 	while(<F>) {
 		chop;
 		last if /^Build-Depends:/i;
@@ -43,6 +60,8 @@
 		last if /^\S/;
 		$deps .= $_;
 	}
+	close F;
+	system("git checkout debian/control" )==0 or die "git checkout failed: $!";
 
 	my @deps;
 	foreach my $p (split /,/, $deps) {