[qgis] 01/01: Rebuild 2.14.22+dfsg for trusty

[Martin Landa]

This is an automated email from the git hooks/post-receive script.

martinl-guest pushed a commit to branch ubuntu/trusty
in repository qgis.

commit c54e6722ad8161dd14b7c35dd135889c44a38930
Author: Martin Landa <landa.martin at gmail.com>
Date:   Thu Feb 1 00:38:02 2018 +0100

    Rebuild 2.14.22+dfsg for trusty
---
 debian/changelog |  6 ++++++
 debian/control   | 40 ++++++++++++++++++++++++++++++----------
 debian/qgis.sh   |  4 ++--
 debian/rules     |  2 +-
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06e8ac8..1eccb98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.22+dfsg-1~trusty1) trusty; urgency=medium
+
+  * Rebuild for trusty.
+
+ -- Martin Landa <landa.martin at gmail.com>  Mon, 29 Jan 2018 16:13:40 +0100
+
 qgis (2.14.22+dfsg-1) unstable; urgency=medium
 
   * Update copyright-format URL to use HTTPS.
diff --git a/debian/control b/debian/control
index 31aa752..0bc183d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,16 +6,16 @@ Section: science
 Priority: optional
 Build-Depends: bison,
                cmake (>= 2.8),
-               debhelper (>= 9.20160114),
+               debhelper,
                dh-python,
                flex,
                gdal-bin,
-               grass-dev (>= 7.2.0),
+               grass-dev (>= 7.4.0),
                libexpat1-dev,
                libfcgi-dev,
                libgdal-dev (>= 1.10.1-0~),
                libgeos-dev (>= 3.0.0),
-               libgsl-dev,
+               libgsl0-dev,
 #               libosgearth-dev (>= 2.5.0),
                libpq-dev,
                libproj-dev,
@@ -23,9 +23,9 @@ Build-Depends: bison,
                libqt4-opengl-dev,
                libqt4-sql-sqlite,
                libqca2-dev,
-               libqca2-plugins,
-               libqscintilla2-qt4-dev,
-#               libqtwebkit-dev,
+#               libqca2-plugins,
+               libqscintilla2-dev,
+               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
                libsqlite3-dev,
@@ -38,7 +38,7 @@ Build-Depends: bison,
                python-qt4 (>= 4.1.0),
                python-qt4-dev (>= 4.1.0),
                python-qt4-sql,
-               pyqt4.qsci-dev,
+#               pyqt4.qsci-dev,
                python-gdal,
                python-mock,
                python-nose2,
@@ -218,11 +218,11 @@ Description: QGIS - shared server library
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
-Depends: grass-dev (>= 7.2.0),
+Depends: grass-dev (>= 7.4.0),
          libexpat1-dev,
          libgdal-dev (>= 1.10.1-0~),
          libgeos-dev (>= 3.0.0),
-         libgsl-dev,
+         libgsl0-dev,
          libpq-dev,
          libproj-dev,
          libqgis-app2.14.22 (= ${binary:Version}),
@@ -250,6 +250,26 @@ Description: QGIS - development files
  This package contains the headers and libraries needed to develop plugins for
  QGIS.
 
+Package: qgis-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libqgis-app2.14.22 (= ${binary:Version}),
+         libqgis-core2.14.22 (= ${binary:Version}),
+         libqgis-gui2.14.22 (= ${binary:Version}),
+         libqgis-analysis2.14.22 (= ${binary:Version}),
+         libqgis-networkanalysis2.14.22 (= ${binary:Version}),
+         libqgis-server2.14.22 (= ${binary:Version}),
+         libqgisgrass7-2.14.22 (= ${binary:Version}),
+         libqgispython2.14.22 (= ${binary:Version}),
+         ${misc:Depends}
+Suggests: gdb
+Description: QGIS - debugging symbols
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains debugging symbols.
+
 Package: qgis-provider-grass
 Architecture: any
 Depends: qgis (= ${binary:Version}),
@@ -268,7 +288,7 @@ Architecture: any
 Depends: qgis (= ${binary:Version}),
          qgis-plugin-grass-common (= ${source:Version}),
          qgis-provider-grass (= ${binary:Version}),
-         grass-core (>= 7.2.0),
+         grass-core (>= 7.4.0),
          ${grass:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/qgis.sh b/debian/qgis.sh
index f4038cb..f972fd5 100644
--- a/debian/qgis.sh
+++ b/debian/qgis.sh
@@ -2,9 +2,9 @@
 
 if dpkg -s qgis-plugin-grass >/dev/null 2>&1; then
 	if [ "$LD_LIBRARY_PATH" = "" ]; then
-		LD_LIBRARY_PATH=/usr/lib/grass72/lib
+		LD_LIBRARY_PATH=/usr/lib/grass74/lib
 	else
-		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass72/lib
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass74/lib
 	fi
 fi
 
diff --git a/debian/rules b/debian/rules
index 5acecc4..ca9ac4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -344,7 +344,7 @@ else
 endif
 
 override_dh_strip:
-	dh_strip --dbgsym-migration='qgis-dbg (<< 2.14.21+dfsg)'
+	dh_strip --dbg-package='qgis-dbg'
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Vgrass:Depends="grass$(GRASSABI)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git