diff -Nru libgdal-grass-2.4.0/debian/changelog libgdal-grass-2.4.2/debian/changelog --- libgdal-grass-2.4.0/debian/changelog 2019-03-22 09:43:01.000000000 +0000 +++ libgdal-grass-2.4.2/debian/changelog 2019-09-07 19:26:06.000000000 +0000 @@ -1,3 +1,34 @@ +libgdal-grass (2.4.2-2~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + + -- Martin Landa 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 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 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 Fri, 22 Mar 2019 16:46:36 +0100 + libgdal-grass (2.4.0-3~bionic1) bionic; urgency=medium * Rebuild for bionic. diff -Nru libgdal-grass-2.4.0/debian/control libgdal-grass-2.4.2/debian/control --- libgdal-grass-2.4.0/debian/control 2019-03-22 09:41:21.000000000 +0000 +++ libgdal-grass-2.4.2/debian/control 2019-09-07 19:26:06.000000000 +0000 @@ -7,13 +7,13 @@ 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/ diff -Nru libgdal-grass-2.4.0/debian/gbp.conf libgdal-grass-2.4.2/debian/gbp.conf --- libgdal-grass-2.4.0/debian/gbp.conf 2019-03-22 09:40:48.000000000 +0000 +++ libgdal-grass-2.4.2/debian/gbp.conf 2019-09-07 19:26:06.000000000 +0000 @@ -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 @@ # Always use pristine-tar. pristine-tar = True + +[buildpackage] +pbuilder-options = --source-only-changes diff -Nru libgdal-grass-2.4.0/debian/lintian-overrides libgdal-grass-2.4.2/debian/lintian-overrides --- libgdal-grass-2.4.0/debian/lintian-overrides 2019-03-22 09:40:48.000000000 +0000 +++ libgdal-grass-2.4.2/debian/lintian-overrides 2019-09-07 19:26:06.000000000 +0000 @@ -1,4 +1,4 @@ # 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 diff -Nru libgdal-grass-2.4.0/debian/patches/rpath libgdal-grass-2.4.2/debian/patches/rpath --- libgdal-grass-2.4.0/debian/patches/rpath 2019-03-22 08:59:12.000000000 +0000 +++ libgdal-grass-2.4.2/debian/patches/rpath 2019-09-07 19:26:06.000000000 +0000 @@ -9,11 +9,11 @@ $(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 $@ $< diff -Nru libgdal-grass-2.4.0/debian/rules libgdal-grass-2.4.2/debian/rules --- libgdal-grass-2.4.0/debian/rules 2019-03-22 09:40:48.000000000 +0000 +++ libgdal-grass-2.4.2/debian/rules 2019-09-07 19:26:06.000000000 +0000 @@ -12,7 +12,7 @@ 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 diff -Nru libgdal-grass-2.4.0/debian/watch libgdal-grass-2.4.2/debian/watch --- libgdal-grass-2.4.0/debian/watch 2019-03-22 08:59:12.000000000 +0000 +++ libgdal-grass-2.4.2/debian/watch 2019-09-07 19:26:06.000000000 +0000 @@ -2,5 +2,5 @@ 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) diff -Nru libgdal-grass-2.4.0/VERSION libgdal-grass-2.4.2/VERSION --- libgdal-grass-2.4.0/VERSION 2018-12-21 19:23:23.000000000 +0000 +++ libgdal-grass-2.4.2/VERSION 2019-07-07 12:21:17.000000000 +0000 @@ -1 +1 @@ -2.4.0 +2.4.2