VERSION

-2.4.0
+2.4.2

debian/changelog

+libgdal-grass (2.4.2-2~bionic1) bionic; urgency=medium
+
+  * Rebuild for bionic.
+
+ -- Martin Landa <landa.martin@gmail.com>  Sat, 07 Sep 2019 21:26:06 +0200
+
+libgdal-grass (2.4.2-2) unstable; urgency=medium
+
+  * Update packaging for GRASS 7.8.0.
+  * Update PIE hardening conditional, trusty is EOL.
+  * Bump Standards-Version to 4.4.0, no changes.
+  * Update watch file to check version directories.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 07 Sep 2019 10:11:51 +0200
+
+libgdal-grass (2.4.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update gbp.conf to use --source-only-changes by default.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 14:25:23 +0200
+
+libgdal-grass (2.4.1-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Remove package name from lintian overrides.
+  * Update packaging for GRASS 7.6.1.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 22 Mar 2019 16:46:36 +0100
+
 libgdal-grass (2.4.0-3~bionic1) bionic; urgency=medium
 
   * Rebuild for bionic.

debian/control

@@ -7,13 +7,13 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                d-shlibs,
-               grass (>= 7.6.1),
-               grass-dev (>= 7.6.1),
-               libgdal-dev (>= 2.4.0),
+               grass (>= 7.8.0),
+               grass-dev (>= 7.8.0),
+               libgdal-dev (>= 2.4.2),
                libpq-dev,
                lsb-release,
                pkg-config
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
 Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b ubuntu/bionic
 Homepage: http://www.gdal.org/

debian/gbp.conf

@@ -2,7 +2,7 @@
 
 # The default name for the upstream branch is "upstream".
 # Change it if the name is different (for instance, "master").
-upstream-branch = upstream
+upstream-branch = upstream-2.4
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
 
 # Always use pristine-tar.
 pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes

debian/lintian-overrides

 # The run path has been added to get GRASS internal library
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
+binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
+binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib
 

debian/patches/rpath

@@ -9,11 +9,11 @@ Forwarded: not-needed
  
  $(GLIBNAME):	grass57dataset.o
 -	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME)
-+	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass76/lib
++	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass78/lib
  
  $(OLIBNAME):	ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
 -	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME)
-+	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass76/lib
++	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass78/lib
  
  %.o:	%.cpp
  	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

debian/rules

@@ -12,7 +12,7 @@ VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo
 DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
 
 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
-  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial bionic))
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),xenial bionic))
     export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
   endif
   export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed

debian/watch

@@ -2,5 +2,5 @@ version=3
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
-https://trac.osgeo.org/gdal/wiki/DownloadSource \
+https://download.osgeo.org/gdal/(\d+\.\d+\.\d+)/ \
 (?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)