[Git][debian-gis-team/qgis][master] 9 commits: Update branch in gbp.conf & Vcs-Git URL.

[Sebastiaan Couwenberg]

Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / qgis


Commits:
1e5ca34a by Bas Couwenberg at 2017-12-10T16:28:25+01:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
0a6d591b by Bas Couwenberg at 2017-12-10T16:30:36+01:00
Update packaging for GRASS 7.4.

- - - - -
edbb1bce by Bas Couwenberg at 2018-01-03T08:10:48+01:00
Update build dependency for libqscintilla2-dev. (closes: #886194)

- - - - -
b2e3577d by Bas Couwenberg at 2018-01-03T11:03:02+01:00
Merge branch 'master' into experimental

- - - - -
ac7474ec by Bas Couwenberg at 2018-01-09T09:42:31+01:00
Merge tag 'debian/2.14.21+dfsg-3' into experimental

- - - - -
3e6f596b by Bas Couwenberg at 2018-01-26T11:42:50+01:00
Merge tag 'debian/2.14.22+dfsg-1' into experimental

- - - - -
8b2ba5de by Bas Couwenberg at 2018-01-26T11:43:54+01:00
Update packaging for GRASS 7.4.0.

- - - - -
34b5d28d by Bas Couwenberg at 2018-01-26T11:44:15+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit 1e5ca34a52a6bbb3e8dccba3f74b6891208e789e.

- - - - -
2190334a by Bas Couwenberg at 2018-01-26T11:45:04+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/qgis.sh


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.22+dfsg-2) unstable; urgency=medium
+
+  * Update packaging for GRASS 7.4.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Jan 2018 11:44:46 +0100
+
 qgis (2.14.22+dfsg-1) unstable; urgency=medium
 
   * Update copyright-format URL to use HTTPS.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: bison,
                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~),
@@ -218,7 +218,7 @@ 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),
@@ -268,7 +268,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}


=====================================
debian/qgis.sh
=====================================
--- 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
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/df8cd17bbaf5f243ea3e0ed50cb3c5481203a545...2190334a23da95e43643fa22af8b381dd8ee13fb

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/df8cd17bbaf5f243ea3e0ed50cb3c5481203a545...2190334a23da95e43643fa22af8b381dd8ee13fb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180126/a8ee0c15/attachment-0001.html>