diff -Nru mapnik-3.0.20+ds/debian/changelog mapnik-3.0.20+ds/debian/changelog --- mapnik-3.0.20+ds/debian/changelog 2018-07-17 13:00:59.000000000 +0000 +++ mapnik-3.0.20+ds/debian/changelog 2018-07-31 19:18:48.000000000 +0000 @@ -1,26 +1,12 @@ -mapnik (3.0.20+ds-1build4) cosmic; urgency=medium +mapnik (3.0.20+ds-2) unstable; urgency=medium - * No-change rebuild for boost soname change. + * Strip trailing whitespace from changelog & rules files. + * Bump Standards-Version to 4.1.5, no changes. + * Use filter instead of findstring to prevent partial matches. + * Drop autopkgtest to test installability. + * Add lintian override for testsuite-autopkgtest-missing. - -- Matthias Klose Tue, 17 Jul 2018 13:00:59 +0000 - -mapnik (3.0.20+ds-1build3) cosmic; urgency=medium - - * Rebuild against new gdal PIC enabled. - - -- Gianfranco Costamagna Fri, 29 Jun 2018 14:53:59 +0200 - -mapnik (3.0.20+ds-1build2) cosmic; urgency=medium - - * Rebuild against new gdal-abi-2-3-0. - - -- Gianfranco Costamagna Fri, 25 May 2018 10:50:10 +0200 - -mapnik (3.0.20+ds-1build1) cosmic; urgency=medium - - * No-change rebuild for proj soname change. - - -- Matthias Klose Sat, 12 May 2018 18:51:58 +0000 + -- Bas Couwenberg Tue, 31 Jul 2018 21:18:48 +0200 mapnik (3.0.20+ds-1) unstable; urgency=medium @@ -818,4 +804,3 @@ * Initial release (Closes: #402792) -- Dominic Hargreaves Sun, 14 Jan 2007 15:53:35 +0000 - diff -Nru mapnik-3.0.20+ds/debian/control mapnik-3.0.20+ds/debian/control --- mapnik-3.0.20+ds/debian/control 2018-04-12 14:23:16.000000000 +0000 +++ mapnik-3.0.20+ds/debian/control 2018-07-05 08:25:13.000000000 +0000 @@ -31,9 +31,9 @@ pkg-config, scons, zlib1g-dev -Standards-Version: 4.1.4 +Standards-Version: 4.1.5 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapnik -Vcs-Git: https://salsa.debian.org/debian-gis-team/mapnik.git -b experimental +Vcs-Git: https://salsa.debian.org/debian-gis-team/mapnik.git Homepage: http://www.mapnik.org/ Package: libmapnik3.0 diff -Nru mapnik-3.0.20+ds/debian/gbp.conf mapnik-3.0.20+ds/debian/gbp.conf --- mapnik-3.0.20+ds/debian/gbp.conf 2018-04-12 13:40:48.000000000 +0000 +++ mapnik-3.0.20+ds/debian/gbp.conf 2018-04-14 11:00:02.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 = experimental +debian-branch = master # git-import-orig uses the following names for the upstream tags. # Change the value if you are not using git-import-orig diff -Nru mapnik-3.0.20+ds/debian/rules mapnik-3.0.20+ds/debian/rules --- mapnik-3.0.20+ds/debian/rules 2018-03-10 07:25:40.000000000 +0000 +++ mapnik-3.0.20+ds/debian/rules 2018-07-17 16:51:41.000000000 +0000 @@ -12,19 +12,19 @@ NJOBS := -j$(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) endif -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) # Disable parallel builds for problematic architectures -NO_PARALLEL_ARCHS = "arm64 armel armhf alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64" +NO_PARALLEL_ARCHS = arm64 armel armhf alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) # From mapnik (3.0.8+ds-1ubuntu1): # The amd64 buildds are castrated to 4G RAM and 4G swap, # the ppc64el buildds to 12G RAM and 4G swap. - NO_PARALLEL_ARCHS += "amd64 ppc64el" + NO_PARALLEL_ARCHS += amd64 ppc64el endif -ifneq (,$(findstring $(DEB_HOST_ARCH),$(NO_PARALLEL_ARCHS))) +ifneq (,$(filter $(DEB_BUILD_ARCH),$(NO_PARALLEL_ARCHS))) NJOBS = -j1 endif @@ -87,4 +87,3 @@ override_dh_makeshlibs: dh_makeshlibs -V - diff -Nru mapnik-3.0.20+ds/debian/source/lintian-overrides mapnik-3.0.20+ds/debian/source/lintian-overrides --- mapnik-3.0.20+ds/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ mapnik-3.0.20+ds/debian/source/lintian-overrides 2018-07-31 19:18:45.000000000 +0000 @@ -0,0 +1,3 @@ +# Not worth the effort +testsuite-autopkgtest-missing + diff -Nru mapnik-3.0.20+ds/debian/tests/control mapnik-3.0.20+ds/debian/tests/control --- mapnik-3.0.20+ds/debian/tests/control 2017-12-14 22:45:19.000000000 +0000 +++ mapnik-3.0.20+ds/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Test installability -Depends: @ -Test-Command: /bin/true