diff -Nru merkaartor-0.18.3+ds/debian/changelog merkaartor-0.18.3+ds/debian/changelog --- merkaartor-0.18.3+ds/debian/changelog 2017-12-17 21:11:03.000000000 +0000 +++ merkaartor-0.18.3+ds/debian/changelog 2018-02-06 20:27:16.000000000 +0000 @@ -1,20 +1,19 @@ -merkaartor (0.18.3+ds-2build3) bionic; urgency=medium +merkaartor (0.18.3+ds-3) unstable; urgency=medium - * Rebuild against new gdal-abi-2-2-3. + [ Bas Couwenberg ] + * Change priority from extra to optional. + * Bump Standards-Version to 4.1.3, changes: priority. + * Strip trailing whitespace from changelog. + * Update copyright-format URL to use HTTPS. + * Drop obsolete dbg package. + * Remove install file, only single binary package built now. + + [ Helmut Grohne ] + * Fix FTCBFS: (Closes: #889756) + + Fix missing build dependency qt5-qmake:native for running lrelease. + + Let dh_auto_configure pass the cross flags to qmake. - -- Gianfranco Costamagna Sun, 17 Dec 2017 22:11:03 +0100 - -merkaartor (0.18.3+ds-2build2) bionic; urgency=medium - - * No-change rebuild against libgps23 - - -- Steve Langasek Fri, 03 Nov 2017 19:04:35 +0000 - -merkaartor (0.18.3+ds-2build1) artful; urgency=medium - - * Rebuild against new gdal ABI. - - -- Gianfranco Costamagna Thu, 13 Jul 2017 13:04:09 +0200 + -- Bas Couwenberg Tue, 06 Feb 2018 21:27:16 +0100 merkaartor (0.18.3+ds-2) unstable; urgency=medium @@ -508,12 +507,12 @@ * Updating Vcs urls after migrating to git. * Updating uscan repackaging script, all we need to remove is the debian directory now. - * Enable OSMARENDER, PROJ, GDAL, GPSD at build time (Closes: #526404). - * Remove get-orig-source-svn target from debian/rules. + * Enable OSMARENDER, PROJ, GDAL, GPSD at build time (Closes: #526404). + * Remove get-orig-source-svn target from debian/rules. * Cleaning up debian/rules targets - slowly preparing to move to dh 7. * Removing executable flags from world_shp files. - * Add missing build-deps on libxml2-dev, libxslt1-dev. + * Add missing build-deps on libxml2-dev, libxslt1-dev. -- Bernd Zeimetz Sun, 03 May 2009 01:21:16 +0200 @@ -542,7 +541,7 @@ - Switching Maintainers and Uploaders as requested by Christoph Berg. - Bumping Standards-Version to 3.8.1. - * debian/patches: + * debian/patches: - Adding gdal-config patch to use gdal-config to find libs and cflags. * debian/copyright: @@ -551,7 +550,7 @@ * debian/rules: - Make files in /usr/share/merkaartor/world_shp/ non-executable. * debian/README.source: - - Adding file as required by policy. + - Adding file as required by policy. -- Bernd Zeimetz Thu, 19 Mar 2009 14:25:26 +0100 @@ -574,7 +573,7 @@ * New upstream version. * Uploading to unstable again. * debian/watch: - - Chainging URLs to point to the new upstream homepage - merkaartor.org. + - Chainging URLs to point to the new upstream homepage - merkaartor.org. -- Bernd Zeimetz Wed, 15 Oct 2008 18:01:50 +0200 @@ -627,7 +626,7 @@ make install later. - Adding get-orig-source-svn target to build a tarball from svn. While packaging the tarball webkit and upstream's debian directory are - removed, too. + removed, too. - Adding get-orig-source target which uses uscan to download and repackage upstream's tarball. - Installing icons and desktop file. @@ -706,7 +705,7 @@ merkaartor (0.0.6-1) unstable; urgency=low - * Upgrade to version 0.0.6 + * Upgrade to version 0.0.6 -- Bart Vanhauwaert Wed, 6 Dec 2006 17:59:51 +0100 diff -Nru merkaartor-0.18.3+ds/debian/control merkaartor-0.18.3+ds/debian/control --- merkaartor-0.18.3+ds/debian/control 2017-11-03 19:04:35.000000000 +0000 +++ merkaartor-0.18.3+ds/debian/control 2018-02-06 20:26:12.000000000 +0000 @@ -1,11 +1,10 @@ Source: merkaartor -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GIS Project +Maintainer: Debian GIS Project Uploaders: Bernd Zeimetz , Bas Couwenberg Section: science -Priority: extra -Build-Depends: debhelper (>= 9), +Priority: optional +Build-Depends: debhelper (>= 9.20160114), libboost-dev, libboost-math-dev, libboost-serialization-dev, @@ -21,11 +20,12 @@ libxml2-dev, libxslt1-dev, qt5-qmake, + qt5-qmake:native, qtbase5-dev, qttools5-dev-tools, sharutils, zlib1g-dev -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/merkaartor.git Vcs-Git: https://anonscm.debian.org/git/pkg-grass/merkaartor.git Homepage: http://www.merkaartor.be/ @@ -48,14 +48,3 @@ * visualize some leisure/landuse areas and road types * displaying GPS information -Package: merkaartor-dbg -Architecture: any -Section: debug -Depends: merkaartor (= ${binary:Version}), - ${misc:Depends} -Description: Debug symbols for merkaartor - Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the - whole world. - . - This package contains debug symbols for merkaartor. - diff -Nru merkaartor-0.18.3+ds/debian/copyright merkaartor-0.18.3+ds/debian/copyright --- merkaartor-0.18.3+ds/debian/copyright 2016-10-15 18:14:34.000000000 +0000 +++ merkaartor-0.18.3+ds/debian/copyright 2018-01-20 21:18:08.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Merkaartor Upstream-Contact: Merkaartor Developers Source: https://github.com/openstreetmap/merkaartor diff -Nru merkaartor-0.18.3+ds/debian/merkaartor.install merkaartor-0.18.3+ds/debian/merkaartor.install --- merkaartor-0.18.3+ds/debian/merkaartor.install 2016-10-15 18:14:34.000000000 +0000 +++ merkaartor-0.18.3+ds/debian/merkaartor.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/bin -usr/lib/merkaartor -usr/share diff -Nru merkaartor-0.18.3+ds/debian/rules merkaartor-0.18.3+ds/debian/rules --- merkaartor-0.18.3+ds/debian/rules 2017-06-25 10:20:33.000000000 +0000 +++ merkaartor-0.18.3+ds/debian/rules 2018-02-06 20:27:16.000000000 +0000 @@ -22,7 +22,7 @@ override_dh_auto_configure: cd translations && make release - qmake Merkaartor.pro \ + dh_auto_configure -- Merkaartor.pro \ TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \ PREFIX=/usr \ GDAL=1 \ @@ -48,5 +48,5 @@ dh_installman debian/merkaartor.1 override_dh_strip: - dh_strip --dbg-package=merkaartor-dbg + dh_strip --dbgsym-migration='merkaartor-dbg (<< 0.18.3+ds-3~)'