diff -Nru libgdal-grass-2.4.2/debian/changelog libgdal-grass-2.4.2/debian/changelog --- libgdal-grass-2.4.2/debian/changelog 2019-07-14 14:00:00.000000000 +0000 +++ libgdal-grass-2.4.2/debian/changelog 2019-09-07 19:26:06.000000000 +0000 @@ -1,8 +1,17 @@ -libgdal-grass (2.4.2-1~bionic0) bionic; urgency=medium - - * No change rebuild for Bionic. +libgdal-grass (2.4.2-2~bionic1) bionic; urgency=medium - -- Angelos Tzotsos Sun, 14 Jul 2019 16:00:00 +0200 + * 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 @@ -20,6 +29,20 @@ -- Bas Couwenberg Fri, 22 Mar 2019 16:46:36 +0100 +libgdal-grass (2.4.0-3~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + * Bump mininum GRASS version to 7.6.1. + + -- Martin Landa Fri, 22 Mar 2019 10:43:01 +0100 + +libgdal-grass (2.3.2-2~bionic2) bionic; urgency=medium + + * Rebuild for bionic. + * Bump mininum GRASS version to 7.6.0. + + -- Martin Landa Mon, 21 Jan 2019 16:49:10 +0100 + libgdal-grass (2.4.0-3) unstable; urgency=medium * Update packaging for GRASS 7.6.0. @@ -70,12 +93,39 @@ -- Bas Couwenberg Fri, 14 Dec 2018 17:12:43 +0100 +libgdal-grass (2.3.2-2~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + * Bump mininum GRASS version to 7.4.3. + + -- Martin Landa Wed, 28 Nov 2018 12:17:52 +0100 + libgdal-grass (2.3.2-3) unstable; urgency=medium * Bump minimum GRASS version to 7.4.3. -- Bas Couwenberg Tue, 27 Nov 2018 07:26:02 +0100 +libgdal-grass (2.2.3-3~bionic5) bionic; urgency=medium + + * Override dh_gencontrol to set GRASS ABI dependency with substvars. + + -- Martin Landa Sun, 28 Oct 2018 12:25:51 +0100 + +libgdal-grass (2.2.3-3~bionic4) bionic; urgency=medium + + * Rebuild for bionic. + * Fix GRASS binary package dependency. + + -- Martin Landa Sun, 28 Oct 2018 12:13:47 +0100 + +libgdal-grass (2.2.3-3~bionic3) bionic; urgency=medium + + * Rebuild for bionic. + * Bump minimum GRASS version to 7.4.2. + + -- Martin Landa Sun, 28 Oct 2018 11:06:54 +0100 + libgdal-grass (2.3.2-2) unstable; urgency=medium * Bump minimum GRASS version to 7.4.2. @@ -111,13 +161,24 @@ -- Bas Couwenberg Sat, 23 Jun 2018 12:25:56 +0200 -libgdal-grass (2.3.0-2) unstable; urgency=medium +libgdal-grass (2.2.3-3~bionic2) bionic; urgency=medium - * Explicitly disable --as-needed on Ubuntu. - See: https://trac.osgeo.org/osgeolive/ticket/2068 - * Bump minimum GRASS version to 7.4.1. + * Rebuild for bionic. - -- Bas Couwenberg Tue, 12 Jun 2018 23:12:26 +0200 + -- Martin Landa Thu, 14 Jun 2018 23:53:40 +0200 + +libgdal-grass (2.2.3-3~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + + -- Martin Landa Thu, 14 Jun 2018 22:38:42 +0200 + +libgdal-grass (2.2.2-1~xenial5) xenial; urgency=medium + + * Rebuild for xenial. + * Bump GRASS minimum version to 7.4.1. + + -- Martin Landa Thu, 14 Jun 2018 00:06:51 +0200 libgdal-grass (2.3.0-1) unstable; urgency=medium @@ -172,6 +233,28 @@ -- Bas Couwenberg Fri, 26 Jan 2018 11:39:22 +0100 +libgdal-grass (2.2.2-1~xenial4) xenial; urgency=medium + + * Rebuild for xenial. + * Bump GRASS minimum version to 7.4.0. + + -- Martin Landa Sat, 27 Jan 2018 11:50:25 +0100 + +libgdal-grass (2.3.0-2) unstable; urgency=medium + + * Explicitly disable --as-needed on Ubuntu. + See: https://trac.osgeo.org/osgeolive/ticket/2068 + * Bump minimum GRASS version to 7.4.1. + + -- Bas Couwenberg Tue, 12 Jun 2018 23:12:26 +0200 + +libgdal-grass (2.2.2-1~xenial3) xenial; urgency=medium + + * Rebuild for xenial. + * Bump GRASS minimum version to 7.4.0RC2. + + -- Martin Landa Fri, 12 Jan 2018 13:36:15 +0100 + libgdal-grass (2.2.3-1) unstable; urgency=medium * Move from experimental to unstable. @@ -188,6 +271,20 @@ -- Bas Couwenberg Fri, 15 Dec 2017 19:38:15 +0100 +libgdal-grass (2.2.2-1~xenial2) xenial; urgency=medium + + * Rebuild for xenial. + * Update rpath patch for GRASS 7.4. + + -- Martin Landa Sun, 19 Nov 2017 22:53:30 +0100 + +libgdal-grass (2.2.2-1~xenial1) xenial; urgency=medium + + * Rebuild for xenial. + * Bump GRASS minimum version to 7.4.0RC1. + + -- Martin Landa Sun, 19 Nov 2017 22:19:30 +0100 + libgdal-grass (2.2.2-2~exp2) experimental; urgency=medium * Update rpath patch for GRASS 7.4. @@ -230,164 +327,46 @@ libgdal-grass (2.2.1-1) unstable; urgency=medium - * Move from experimental to unstable. - - -- Bas Couwenberg Mon, 10 Jul 2017 18:31:09 +0200 - -libgdal-grass (2.2.1-1~exp1) experimental; urgency=medium - - * New upstream release. - - -- Bas Couwenberg Fri, 30 Jun 2017 15:04:00 +0200 - -libgdal-grass (2.2.1~rc1-1~exp1) experimental; urgency=medium + * Rebuild for xenial. + * Bump minimum GRASS version to 7.2.2. - * New upstream release candidate. - * Disable PIE on Ubuntu where it's still problematic. - * Bump Standards-Version to 4.0.0, no changes. - * Add autopkgtest to test installability. - - -- Bas Couwenberg Fri, 23 Jun 2017 17:07:35 +0200 + -- Martin Landa Mon, 18 Sep 2017 12:04:39 +0200 -libgdal-grass (2.2.0-1~exp1) experimental; urgency=medium +libgdal-grass (2.2.1-1~xenial2) xenial; urgency=medium - * New upstream release. - * Bump minimum GRASS version to 7.2.1. + * Rebuild for xenial. - -- Bas Couwenberg Tue, 09 May 2017 18:23:57 +0200 + -- Martin Landa Fri, 01 Sep 2017 17:24:27 +0200 -libgdal-grass (2.2.0~beta1-1~exp1) experimental; urgency=medium - - * New upstream beta release. - * Drop Breaks/Replaces for old binary packages, 2.2 subdirectory now used. +libgdal-grass (2.2.1-1~xenial1) xenial; urgency=medium - -- Bas Couwenberg Sat, 15 Apr 2017 12:17:42 +0200 + * Rebuild for xenial. -libgdal-grass (2.1.3-1~exp2) experimental; urgency=medium + -- Martin Landa Wed, 16 Aug 2017 17:23:07 +0200 - * Merge changes from libgdal-grass (2.1.2-5). - - -- Bas Couwenberg Mon, 03 Apr 2017 01:22:02 +0200 - -libgdal-grass (2.1.3-1~exp1) experimental; urgency=medium - - * New upstream release. - - -- Bas Couwenberg Fri, 27 Jan 2017 13:12:12 +0100 - -libgdal-grass (2.1.3~rc1-1~exp3) experimental; urgency=medium - - * Add Breaks/Replaces for old version specific binary packages. - - -- Bas Couwenberg Thu, 26 Jan 2017 21:11:06 +0100 - -libgdal-grass (2.1.3~rc1-1~exp2) experimental; urgency=medium - - * Rename library package to libgdal-grass, drop now obsolete metapackage. - - -- Bas Couwenberg Sat, 21 Jan 2017 12:20:20 +0100 - -libgdal-grass (2.1.3~rc1-1~exp1) experimental; urgency=medium - - * New upstream release candidate. - * Drop grass72.patch, applied upstream. Refresh remaining patch. - - -- Bas Couwenberg Fri, 20 Jan 2017 11:41:22 +0100 - -libgdal-grass (2.1.2-6) unstable; urgency=medium - - * Bump minimum GRASS version to 7.2.1. - * Bump Standards-Version to 4.0.0, no changes. - * Add autopkgtest to test installability. - - -- Bas Couwenberg Sun, 18 Jun 2017 19:46:34 +0200 - -libgdal-grass (2.1.2-5) unstable; urgency=medium - - * Enable PIE hardening flags. - - -- Bas Couwenberg Sun, 02 Apr 2017 23:43:22 +0200 - -libgdal-grass (2.1.2-4) unstable; urgency=medium - - * Add patch to link GRASS 7.2 libraries. - - -- Bas Couwenberg Tue, 17 Jan 2017 01:50:21 +0100 - -libgdal-grass (2.1.2-3) unstable; urgency=medium - - * Update rpath patch for GRASS 7.2. - - -- Bas Couwenberg Mon, 16 Jan 2017 19:15:15 +0100 - -libgdal-grass (2.1.2-2) unstable; urgency=medium +libgdal-grass (2.1.0-1~xenial2) xenial; urgency=medium * Bump minimum GRASS version to 7.2.0. - * Move from experimental to unstable. - - -- Bas Couwenberg Wed, 28 Dec 2016 19:46:06 +0100 - -libgdal-grass (2.1.2-2~exp1) experimental; urgency=medium - - * Bump minimum GRASS version to 7.2.0~rc1. - - -- Bas Couwenberg Fri, 28 Oct 2016 16:30:08 +0200 - -libgdal-grass (2.1.2-1) unstable; urgency=medium - - * Move from experimental to unstable. - - -- Bas Couwenberg Fri, 28 Oct 2016 00:08:05 +0200 - -libgdal-grass (2.1.2-1~exp1) experimental; urgency=medium - - * New upstream release. - - -- Bas Couwenberg Thu, 27 Oct 2016 20:20:08 +0200 - -libgdal-grass (2.1.2~rc1-1~exp1) experimental; urgency=medium - - * New upstream release candidate. - - -- Bas Couwenberg Fri, 14 Oct 2016 19:40:18 +0200 - -libgdal-grass (2.1.1-3) unstable; urgency=medium - - * Bump minimum GRASS version to 7.0.5. - - -- Bas Couwenberg Sun, 02 Oct 2016 22:30:08 +0200 - -libgdal-grass (2.1.1-2) unstable; urgency=medium - - * Move from experimental to unstable. - - -- Bas Couwenberg Wed, 10 Aug 2016 15:02:31 +0200 - -libgdal-grass (2.1.1-2~exp1) experimental; urgency=medium - + * Update rpath patch for GRASS 7.2. + * Add patch to link GRASS 7.2 libraries. + * Move control file generation to separate templates target. * Add metapackage to pull in the version specific binary package. + * Update watch file to use HTTPS for trac.osgeo.org. - -- Bas Couwenberg Sat, 06 Aug 2016 23:04:16 +0200 - -libgdal-grass (2.1.1-1) unstable; urgency=medium - - * Move from experimental to unstable. - - -- Bas Couwenberg Wed, 13 Jul 2016 16:30:03 +0200 + -- Bas Couwenberg Tue, 17 Jan 2017 15:41:24 +0100 -libgdal-grass (2.1.1-1~exp1) experimental; urgency=medium +libgdal-grass (2.1.0-1~xenial1) xenial; urgency=medium - * New upstream release. - * Update watch file to use HTTPS for trac.osgeo.org. + * Update branch in gbp.conf & Vcs-Git URL. + * Bump minimum GRASS version to 7.0.5. - -- Bas Couwenberg Wed, 13 Jul 2016 12:11:01 +0200 + -- Bas Couwenberg Mon, 03 Oct 2016 13:21:18 +0200 -libgdal-grass (2.1.1~rc1-1~exp1) experimental; urgency=medium +libgdal-grass (2.1.0-1~xenial0) xenial; urgency=medium - * New upstream release candidate. - * Move control file generation to separate templates target. + * No change build for Xenial. - -- Bas Couwenberg Mon, 04 Jul 2016 21:56:57 +0200 + -- Angelos Tzotsos Tue, 31 May 2016 21:38:00 +0200 libgdal-grass (2.1.0-1) unstable; urgency=medium @@ -424,13 +403,6 @@ -- Bas Couwenberg Fri, 19 Feb 2016 15:55:24 +0100 -libgdal-grass (1.11.4-1) UNRELEASED; urgency=medium - - * New upstream release. - * Bump Standards-Version to 3.9.7, no changes. - - -- Bas Couwenberg Sat, 06 Feb 2016 16:16:29 +0100 - libgdal-grass (1.11.3-3) unstable; urgency=medium * Update Vcs-Git URL to use HTTPS. diff -Nru libgdal-grass-2.4.2/debian/control libgdal-grass-2.4.2/debian/control --- libgdal-grass-2.4.2/debian/control 2019-07-07 12:24:49.000000000 +0000 +++ libgdal-grass-2.4.2/debian/control 2019-09-07 19:26:06.000000000 +0000 @@ -7,15 +7,15 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, d-shlibs, - grass (>= 7.6.1), - grass-dev (>= 7.6.1), + 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 +Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b ubuntu/bionic Homepage: http://www.gdal.org/ Package: libgdal-grass diff -Nru libgdal-grass-2.4.2/debian/gbp.conf libgdal-grass-2.4.2/debian/gbp.conf --- libgdal-grass-2.4.2/debian/gbp.conf 2019-07-07 12:24:06.000000000 +0000 +++ libgdal-grass-2.4.2/debian/gbp.conf 2019-09-07 19:26:06.000000000 +0000 @@ -6,7 +6,7 @@ # The default name for the Debian branch is "master". # Change it if the name is different (for instance, "debian/unstable"). -debian-branch = master +debian-branch = ubuntu/bionic # git-import-orig uses the following names for the upstream tags. # Change the value if you are not using git-import-orig diff -Nru libgdal-grass-2.4.2/debian/patches/rpath libgdal-grass-2.4.2/debian/patches/rpath --- libgdal-grass-2.4.2/debian/patches/rpath 2019-07-07 12:24:01.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.2/debian/rules libgdal-grass-2.4.2/debian/rules --- libgdal-grass-2.4.2/debian/rules 2019-07-07 12:24:01.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.2/debian/watch libgdal-grass-2.4.2/debian/watch --- libgdal-grass-2.4.2/debian/watch 2019-07-07 12:24:01.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)