From: Bas Couwenberg Date: Sat, 4 Sep 2021 15:05:19 +0000 (+0100) Subject: merkaartor (0.19.0+ds-2) unstable; urgency=medium X-Git-Tag: archive/raspbian/0.19.0+ds-5+rpi1~1^2^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32b2bd2808bd54666ccf51f0f624993d2832f27e;p=merkaartor.git merkaartor (0.19.0+ds-2) unstable; urgency=medium * Team upload. * Drop -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H, proj.h is supported now. (closes: #993609) [dgit import unpatched merkaartor 0.19.0+ds-2] --- 32b2bd2808bd54666ccf51f0f624993d2832f27e diff --cc debian/changelog index 0000000,0000000..23a3317 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,859 @@@ ++merkaartor (0.19.0+ds-2) unstable; urgency=medium ++ ++ * Team upload. ++ * Drop -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H, proj.h is supported now. ++ (closes: #993609) ++ ++ -- Bas Couwenberg Sat, 04 Sep 2021 17:05:19 +0200 ++ ++merkaartor (0.19.0+ds-1) unstable; urgency=medium ++ ++ * New ustream minor version. ++ * Debianization: ++ - d/copyright: ++ - Files-Excluded list, refresh; ++ - d/control: ++ - Build-Depends: ++ - qtwebengine5-dev dependency, discard (Closes: #991025); ++ - qtwebengine5-dev dependency, specify supported arch (idem); ++ - d/rules: ++ - USEWEBENGINE, set wrt arch supporting qtwebengine5-dev (idem); ++ - d/p/spelling-errors.patch, integrated. ++ ++ -- Jerome Benoit Sun, 29 Aug 2021 12:45:57 +0000 ++ ++merkaartor (0.19.0~rc1+ds-1) unstable; urgency=medium ++ ++ [ Bas Couwenberg ] ++ * Bump Standards-Version to 4.5.1, no changes. ++ * Update watch file for GitHub URL changes. ++ ++ [ Jerome Benoit ] ++ * New upstream minor version (Closes: #983245) ++ * Update d/copyright ++ * Refreh d/patches/* ++ ++ -- Jerome Benoit Sun, 13 Jun 2021 20:15:20 +0000 ++ ++merkaartor (0.18.4+ds-5) unstable; urgency=medium ++ ++ * FTBFS fix version: apply upstream fix for building against ++ recent version of Qt (Closes: #974104). ++ * Debianization: ++ - d/p/upstream-Qt5_15-fix.patch, introduce. ++ - d/control: ++ - debhelper, bump to 13; ++ - d/s/lintian-overrides: ++ - testsuite-autopkgtest-missing tag, discard. ++ ++ -- Jerome Benoit Wed, 11 Nov 2020 20:53:53 +0000 ++ ++merkaartor (0.18.4+ds-4) unstable; urgency=medium ++ ++ * Team upload. ++ * Revert Maintainer email address change. ++ ++ -- Bas Couwenberg Tue, 05 May 2020 09:16:30 +0200 ++ ++merkaartor (0.18.4+ds-3) unstable; urgency=medium ++ ++ [ Helmut Grohne ] ++ * Fix FTCBFS: Let dh_auto_configure use a cross qmake (closes: #959671). ++ ++ [ Jerome Benoit ] ++ * Debianization: ++ - debian/control: ++ - Maintainer email address, update. ++ ++ -- Jerome Benoit Tue, 05 May 2020 05:55:21 +0000 ++ ++merkaartor (0.18.4+ds-2) unstable; urgency=medium ++ ++ * source-only upload. ++ ++ -- Jerome Benoit Wed, 29 Apr 2020 19:49:20 +0000 ++ ++merkaartor (0.18.4+ds-1) unstable; urgency=medium ++ ++ [ Bas Couwenberg ] ++ * Add gbp.conf to use pristine-tar & --source-only-changes by default. ++ * Restructure control file with cme. ++ * Drop Name field from upstream metadata. ++ ++ [ Jerome Benoit ] ++ * Reintroduction release (Closes: #949792), new package uploader. ++ * New upstream release (Closes: #949183). ++ * Debianization: ++ - debian/control: ++ - Uploaders, new uploader: ++ - Jerome Benoit ; ++ - Standards-Version, bump to 4.5.0 (no change); ++ - debhelper, bump to version 12; ++ - debian/copyright: ++ - Files-Excluded field, introduce; ++ - Files main paragraph, harden; ++ - Files paragraphs, harden; ++ - License paragraphs, cleanup; ++ - debian/watch: ++ - migration to version 4; ++ - repack options, add; ++ - debian/rules, update and cleanup; ++ - debian/patches/*: ++ - d/p/performance-typo.patch, integrated; ++ - d/p/spelling-errors.patch, refresh; ++ - d/p/upstream-gpsd-9+-fix_time.patch, introduce; ++ - debian/source/lintian-overrides, refresh; ++ - debian/docs, improve; ++ - debian/{dirs,compat,README.source,gbp.conf}, discard. ++ ++ -- Jerome Benoit Thu, 16 Apr 2020 08:55:48 +0000 ++ ++merkaartor (0.18.3+ds-6) unstable; urgency=medium ++ ++ * Bump Standards-Version to 4.4.0, no changes. ++ * Update watch file to limit matches to archive path. ++ * Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility. ++ * Update spelling errors patch to fix additional issues. ++ * Update gbp.conf to use --source-only-changes by default. ++ ++ -- Bas Couwenberg Thu, 11 Jul 2019 14:10:43 +0200 ++ ++merkaartor (0.18.3+ds-5) unstable; urgency=medium ++ ++ * Drop autopkgtest to test installability. ++ * Add lintian override for testsuite-autopkgtest-missing. ++ ++ -- Bas Couwenberg Tue, 31 Jul 2018 23:55:34 +0200 ++ ++merkaartor (0.18.3+ds-4) unstable; urgency=medium ++ ++ * Add patch to fix spelling errors. ++ * Update Vcs-* URLs for Salsa. ++ * Bump Standards-Version to 4.1.5, no changes. ++ * Strip trailing whitespace from changelog, control & rules files. ++ * Add override for missing-explanation-for-repacked-upstream-tarball. ++ ++ -- Bas Couwenberg Fri, 20 Jul 2018 20:19:49 +0200 ++ ++merkaartor (0.18.3+ds-3) unstable; urgency=medium ++ ++ [ 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. ++ ++ -- Bas Couwenberg Tue, 06 Feb 2018 21:27:16 +0100 ++ ++merkaartor (0.18.3+ds-2) unstable; urgency=medium ++ ++ * Add patch to fix 'performance' typo. ++ * Don't create revision.h, no longer used. ++ * Bump Standards-Version to 4.0.0, no changes. ++ * Add autopkgtest to test installability. ++ ++ -- Bas Couwenberg Sun, 25 Jun 2017 15:16:52 +0200 ++ ++merkaartor (0.18.3+ds-1) unstable; urgency=medium ++ ++ * New upstream release (from modified release tag). ++ * Fix filenamemangle in watch file. ++ * Refresh patches. ++ ++ -- Bas Couwenberg Tue, 06 Sep 2016 17:03:10 +0200 ++ ++merkaartor (0.18.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Drop patches applied upstream. Refresh remaining patch. ++ * Add patch to extract version from CHANGELOG, not git. ++ * Move from experimental to unstable. ++ ++ -- Bas Couwenberg Tue, 23 Aug 2016 23:30:27 +0200 ++ ++merkaartor (0.18.3~rc1-1~exp1) experimental; urgency=medium ++ ++ * New upstream release candidate. ++ * Drop custom hicolor changes, included upstream. ++ * Update copyright file, changes: ++ - Update copyright years for Bart Vanhauwaert, ++ Chris Browet & Ladislav Láska. ++ * Drop patches applied upstream, refresh remaining patches. ++ * Add patch to fix 'committed' typo. ++ ++ -- Bas Couwenberg Mon, 06 Jun 2016 22:33:14 +0200 ++ ++merkaartor (0.18.2-7) unstable; urgency=medium ++ ++ * Enable all hardening buildflags. ++ * Install additional icon sizes in hicolor theme. ++ * Bump Standards-Version to 3.9.8, changes: ++ additional icon sizes in hicolor theme. ++ ++ -- Bas Couwenberg Sun, 17 Apr 2016 20:45:36 +0200 ++ ++merkaartor (0.18.2-6) unstable; urgency=medium ++ ++ * Update Vcs-Git URL to use HTTPS. ++ * Add patches for various typos. ++ * Bump Standards-Version to 3.9.7, no changes. ++ ++ -- Bas Couwenberg Wed, 02 Mar 2016 19:57:59 +0100 ++ ++merkaartor (0.18.2-5) unstable; urgency=medium ++ ++ * Drop explicitly dependency on libqt5xcbqpa5, now provided by libqt5gui5. ++ (closes: #812234) ++ ++ -- Bas Couwenberg Thu, 21 Jan 2016 21:32:45 +0100 ++ ++merkaartor (0.18.2-4) unstable; urgency=medium ++ ++ * Rebuild with libquazip (0.7.1-1). ++ - Update build dependency from libquazip-qt5-dev to libquazip5-dev ++ - Update SYSTEM_QUAZIP_LDFLAGS from -lquazip-qt5 to -lquazip5 ++ * Add patches for 'Unknown' & 'occurrence' typos. ++ ++ -- Bas Couwenberg Sun, 10 Jan 2016 02:23:28 +0100 ++ ++merkaartor (0.18.2-3) unstable; urgency=medium ++ ++ * Add upstream metadata. ++ * Add patch to fix libgps22 compatibility. ++ * Use upstream patch for quazip-qt5 linking. ++ * Add patch to fix desktop Keywords syntax. ++ ++ -- Bas Couwenberg Sun, 01 Nov 2015 16:55:41 +0100 ++ ++merkaartor (0.18.2-2) unstable; urgency=medium ++ ++ * Add dependency on libqt5xcbqpa5. ++ (closes: #802745) ++ ++ -- Bas Couwenberg Fri, 23 Oct 2015 12:49:07 +0200 ++ ++merkaartor (0.18.2-1) unstable; urgency=medium ++ ++ * Use desktop file in favor of menu file per CTTE #741573. ++ * Move from experimental to unstable. ++ ++ -- Bas Couwenberg Sun, 11 Oct 2015 13:21:33 +0200 ++ ++merkaartor (0.18.2-1~exp2) experimental; urgency=medium ++ ++ * Add patches for improved GDAL 2.0 support, and debug build fix. ++ * Add debug package for merkaartor. ++ (closes: #692524) ++ ++ -- Bas Couwenberg Fri, 25 Sep 2015 00:57:24 +0200 ++ ++merkaartor (0.18.2-1~exp1) experimental; urgency=medium ++ ++ * New upstream release. ++ * Move package to Debian GIS team, changes: ++ - Move Maintainer to Uploaders ++ - Set Debian GIS Project as Maintainer ++ - Update Vcs-* URLs for git repository on Alioth ++ - Add myself to Uploaders ++ * Bump debhelper compatibility to 9. ++ * Updates for new upstream development by the OpenStreetMap community: ++ - Update watch file for move to GitHub. ++ - Update Homepage URL to www.merkaartor.be. ++ (closes: #731118) ++ * Switch to source format 3.0 (quilt). ++ * Use minimal dh rules. ++ - Enable parallel builds ++ (closes: #759128) ++ * Drop patches applied upstream. ++ * Update copyright file using copyright-format 1.0. ++ * Restructure control file with cme. ++ * Update Vcs-Browser URL to use HTTPS. ++ * Override dh_install to use --list-missing. ++ * Rename old style config sections in gbp.conf. ++ * Add patch to fix version detection for tarball releases. ++ * Switch to Qt5. ++ (closes: #784494) ++ * Disable zbar, is Qt4-only. ++ * Use dh_auto_* commands in overrides. ++ * Disable SpatiaLite support, causes FTBFS. ++ * Add patch to fix various typos. ++ * Add patch to add hardening buildflags to qmake build. ++ * Don't create empty usr/sbin directory. ++ * Add patch to add Keywords to merkaartor.desktop. ++ * Bump Standards-Version to 3.9.6, changes: ++ - canonical Vcs-* URLs ++ - copyright-format 1.0 ++ ++ -- Bas Couwenberg Fri, 18 Sep 2015 20:25:30 +0200 ++ ++merkaartor (0.18.1-3) unstable; urgency=low ++ ++ * [7a6844de] Yet another qreal/double conversion fix for arm. ++ ++ -- Bernd Zeimetz Sat, 23 Jun 2012 00:40:16 +0200 ++ ++merkaartor (0.18.1-2) unstable; urgency=low ++ ++ * [36283246] Fix FTBFS on arm*. ++ qreal is float on arm, not double. ++ Adding some casts should work around that. ++ ++ -- Bernd Zeimetz Fri, 22 Jun 2012 17:30:43 +0200 ++ ++merkaartor (0.18.1-1) unstable; urgency=low ++ ++ * [4bbcfdd9] Merge branch 'upstream' - 0.18.1 ++ * [00c34d93] Refreshing patches. ++ ++ -- Bernd Zeimetz Thu, 21 Jun 2012 21:53:10 +0200 ++ ++merkaartor (0.17.2-7) unstable; urgency=low ++ ++ * [7d02a1c5] Revert "Use g++-4.6 to work around the g++-4.7 fuckup." ++ This reverts commit 887fc7cda2477d688d8e35b9d5bfe6d99ae9adeb. ++ * [b2a27bf9] Updating debian/patches/gcc-4.7-ftbfs-fix. ++ Thanks to Matthias Klose (Closes: #667275) ++ * [86e9d24c] Updating git URLs. ++ ++ -- Bernd Zeimetz Wed, 30 May 2012 10:39:12 +0200 ++ ++merkaartor (0.17.2-6) unstable; urgency=low ++ ++ * [e6686007] Add patch to fix a FTBFS with gcc-4.7, part of a fix ++ for #667275. ++ * [ee1c4832] Build-depend against libgdal-dev instead of libgdal1-dev. ++ * [887fc7cd] Use g++-4.6 to work around the g++-4.7 fuckup. ++ Very ugly workaround for #672397. ++ Shall be removed again as soon as the bug is fixed, but for now making ++ some transitions work is more important. ++ ++ -- Bernd Zeimetz Sat, 12 May 2012 21:21:24 +0200 ++ ++merkaartor (0.17.2-5) unstable; urgency=low ++ ++ * [ccae59e4] Add patch to allow building against libgps20. (Closes: #648481) ++ ++ -- Bernd Zeimetz Sat, 12 Nov 2011 21:55:34 +0100 ++ ++merkaartor (0.17.2-4) unstable; urgency=low ++ ++ * [e594817c] Build with libproxy for automatic proxy configuration. ++ Thanks to Jarl Friis ++ * [e9a5e253] Pull latest 0.17-fixes branch into patches. ++ * [2e5342d8] Build against libqtwebkit-dev. ++ * [27542332] Add patch to fix building with libproxy. ++ ++ -- Bernd Zeimetz Wed, 06 Jul 2011 22:22:10 +0200 ++ ++merkaartor (0.17.2-3) unstable; urgency=low ++ ++ * [5fd3c0a8] Add a patch to fix linker issues. ++ ++ -- Bernd Zeimetz Sun, 27 Feb 2011 18:32:07 +0100 ++ ++merkaartor (0.17.2-2) unstable; urgency=low ++ ++ * [26c92163] Work around buildd insanities from the last century. (Closes: #613440) ++ ++ -- Bernd Zeimetz Mon, 14 Feb 2011 23:57:09 +0100 ++ ++merkaartor (0.17.2-1) unstable; urgency=low ++ ++ * New upstream release - 0.17.2 ++ * [b3dc89d4] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Fri, 11 Feb 2011 14:28:38 +0100 ++ ++merkaartor (0.17.0-1) experimental; urgency=low ++ ++ * New upstream release - 0.17.0 ++ * [276b9b4c] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Sun, 26 Dec 2010 17:03:12 +0100 ++ ++merkaartor (0.17~rc4-1) experimental; urgency=low ++ ++ * Git snapshot: 0.17-rc4 ++ * [2bb70fbf] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Mon, 13 Dec 2010 22:52:28 +0100 ++ ++merkaartor (0.17~rc3-1) experimental; urgency=low ++ ++ * Git snapshot: 0.17-rc3 ++ * [bea22dfd] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Sun, 05 Dec 2010 22:36:30 +0100 ++ ++merkaartor (0.17~rc2-1) experimental; urgency=low ++ ++ * Git snapshot: 0.17-rc2 ++ * [d9292047] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Sun, 05 Dec 2010 15:34:27 +0100 ++ ++merkaartor (0.17~rc1-1) experimental; urgency=low ++ ++ * Git snapshot: 0.17-rc1 ++ * [4791e742] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Fri, 03 Dec 2010 14:57:45 +0100 ++ ++merkaartor (0.17~dev4-1) experimental; urgency=low ++ ++ * [14cba520] Merge branch 'upstream' ++ * [e5f0763d] Use libproj for cartographic projections ++ ++ -- Bernd Zeimetz Wed, 24 Nov 2010 13:51:15 +0100 ++ ++merkaartor (0.17~dev3-1) experimental; urgency=low ++ ++ * Git snapshot. ++ * [449d8fea] Merge branch 'upstream' ++ * [f65b7265] Enable the Spatialite plugin ++ http://www.gaia-gis.it/spatialite/ ++ Upstream says: "This one is more an experiment at this time." ++ ++ -- Bernd Zeimetz Tue, 02 Nov 2010 12:24:41 +0100 ++ ++merkaartor (0.17~dev2-1) experimental; urgency=low ++ ++ * Git snapshot. ++ * [7fd4c049] Merge branch 'upstream' ++ * [617550a8] Keep debug symbols in the package for experimental. A - ++ dbg package will be introduced after the release of Squeeze. ++ ++ -- Bernd Zeimetz Mon, 25 Oct 2010 12:42:54 +0200 ++ ++merkaartor (0.17~dev1-1) experimental; urgency=low ++ ++ * Git snapshot. ++ ++ -- Bernd Zeimetz Wed, 29 Sep 2010 15:17:20 +0200 ++ ++merkaartor (0.16.3-1) unstable; urgency=low ++ ++ * [e9c11925] Merge branch 'upstream' ++ ++ Updating to version 0.16.3 - Upstream bugfix release, ++ fixing the following bugs: ++ ++ v0.16.3 ++ * FIX : language support broken ++ v0.16.2 ++ * FIX : Initial viewport issue ++ * FIX : Do not export incomplete features ++ * FIX : CSV import bugs ++ * FIX : Use "GPX track width" setting even when not in "Simple track ++ appearance" (Merkaartor bug #3095) ++ * FIX : temporary solution for #3082 ++ * CHG : Allow to pan with middle mouse button ++ * FIX : lat/lon grid Merkaartor bug for non-othogonal projections ++ * FIX : for non-rthogonal projections, maximize the viewport in lat/lon ++ * FIX : Handle empty style list in editor (Merkaartor bug #3079) ++ * FIX : Fix scale bar to take latitude into account. ++ * FIX : Do not tag-match relation's children unless the type is ++ "multippolygon" (Merkaartor bug #2916) ++ * FIX : problem with "Bottom-left standard" TMS ++ * FIX : OSX fix ++ * FIX : Draw relations children dashed to avoid multiple parent drawing ++ * FIX : Fix several issues with features dock. ++ * FIX : Fix reappearance of deleted features. ++ * FIX : Fix WayRemoveNodeCommand reversibility. ++ ++ -- Bernd Zeimetz Thu, 26 Aug 2010 12:56:37 +0200 ++ ++merkaartor (0.16.1-1) unstable; urgency=low ++ ++ * [486efdb0] Merge branch 'upstream' ++ Updating to version 0.16.1. ++ ++ -- Bernd Zeimetz Tue, 15 Jun 2010 01:13:43 +0200 ++ ++merkaartor (0.16.0-1) unstable; urgency=low ++ ++ * [d177c38a] Merge branch 'upstream' ++ Updating to upstream version 0.16.0. ++ The new version handles the opening of files from the command line ++ properly again, thanks to Paul Wise for the report. (Closes: #582615). ++ ++ -- Bernd Zeimetz Mon, 07 Jun 2010 18:55:21 +0200 ++ ++merkaartor (0.16~dev2-2) experimental; urgency=low ++ ++ * [11dfe8e7] Build-depend on debhelper 7. ++ * [672b02c9] Use source format 1.0. ++ * [0df889e5] Remove old/unused qmake options. ++ ++ -- Bernd Zeimetz Tue, 25 May 2010 16:33:09 +0200 ++ ++merkaartor (0.16~dev2-1) experimental; urgency=low ++ ++ * Git snapshot. ++ * [ef47f28a] Bump Standards-Version to 3.8.4, no changes needed. ++ * [2696e06a] Merge branch 'upstream' ++ ++ -- Bernd Zeimetz Tue, 25 May 2010 00:48:46 +0200 ++ ++merkaartor (0.16~dev1-1) experimental; urgency=low ++ ++ * [d9c0ad7d] Use ZBAR=1/libzbarqt-dev to support walking-papers. ++ * [aee038e6] Disable nvidia_hack again, did not help at all. ++ * [51503a29] Update copyright file. ++ * [04b41e20] Build and install translations. ++ * [17b467a6] Bump dh compat level to 7. ++ * [965a0900] Merge branch 'upstream' ++ * [f8f234a3] Update merged gbp.conf. ++ * [8e36fedb] Make debian/rules executable. ++ * [8943dad1] Remove unnecessary lrelease call. ++ * [cc6b89f3] Require zbar version 0.10. ++ ++ -- Bernd Zeimetz Thu, 20 May 2010 10:40:20 +0200 ++ ++merkaartor (0.15.3+svn20936-1) experimental; urgency=low ++ ++ * [5b46fb79] Enable gpsdlib and nvidia_hack build optins. ++ * [119a8792] Merge branch 'experimental-upstream' into experimental ++ * [5d914c06] Add libgps-dev as build-dependency. ++ ++ -- Bernd Zeimetz Mon, 19 Apr 2010 21:26:18 +0200 ++ ++merkaartor (0.15.3+svn20934-1) experimental; urgency=low ++ ++ * svn snapshot. ++ * [e4450396] Add minimum requirement for libboost to control file. ++ * [d55fea41] Allow debug builds for release builds. Use ++ DEB_BUILD_OPTIONS=debug to enable. ++ * [8642266c] Merge branch 'experimental-upstream' into experimental ++ * [58dbd32e] Remove debian/uscan_repack.sh. Not needed anymore. ++ * [31a49fa5] Remote get-orig-source target. ++ * [ffe12b6a] Update gbp.conf for experimental. ++ ++ -- Bernd Zeimetz Mon, 19 Apr 2010 10:54:27 +0200 ++ ++merkaartor (0.15.3-1) unstable; urgency=low ++ ++ * [fa5d9441] Merge branch 'upstream' ++ Updating to upstream release 0.15.3. This should include a fix ++ for crashes which happened while double-clicking nodes. ++ (Closes: #573237) ++ ++ -- Bernd Zeimetz Mon, 22 Mar 2010 17:13:26 +0100 ++ ++merkaartor (0.15.2-1) unstable; urgency=low ++ ++ * [230e355d] Merge branch 'upstream' ++ Updating to upstream release 0.15.2. ++ ++ -- Bernd Zeimetz Mon, 08 Mar 2010 13:46:07 +0100 ++ ++merkaartor (0.15.1-1) unstable; urgency=low ++ ++ * [96465283] Use merkaartor.desktop from upstream. This also avoids ++ duplicate entries in the desktop menu. (Closes: #522986) - thanks to ++ Simon Wenner ++ * [69d49210] Use NODEBUG=1 RELEASE=1 unless we build for experimental. ++ This also avoids writing log files into the user's home directory for ++ non-experimental builds (Closes: #570472) ++ * [df0f9808] Merge branch 'upstream'. ++ Updating to Merkaartor 0.15.1, which should also fix the folloing ++ bugs: ++ - fails to set bbox on WMS requests (Closes: #563322) ++ - About dialog doesn't expand properly (Closes: #570471) ++ - crash on exit while tiles are still downloading ++ (Closes: #570475) ++ Special thanks go to Paul Wise for testing the RC of Merkaartor and ++ reporting several issues, which should be all fixed now. ++ * [117fe533] Dropping gdal-config patch, applied upstream. ++ * [b703ac46] Drop zlib-include patch, not necessary anymore. ++ * [892a0b89] Create revision.h with the Debian version. ++ ++ -- Bernd Zeimetz Mon, 01 Mar 2010 20:12:32 +0100 ++ ++merkaartor (0.15~pre~svn19956-1) experimental; urgency=low ++ ++ * [dbe3b91e] merkaartor needs qt4 4.4.3 at least, bump build-dep ++ accordingly. ++ * [c32e8688] Merge branch 'upstream' - update to latest svn trunk. ++ * [975f577f] Drop log-to-dev-null patch. Logging was disabled by ++ upstream. ++ * [cee6c802] Update patches for the new svn version. ++ * [ae638a32] Remove Christoph Berg from uploaders. ++ * [34b55871] Update git repository location. Moving out of collob- ++ maint. ++ * [44f13093] Patch MGdalBackground.pro to use gdal-config. ++ ++ -- Bernd Zeimetz Tue, 16 Feb 2010 11:30:43 +0100 ++ ++merkaartor (0.14+svnfixes~20090912-2) unstable; urgency=high ++ ++ * [6a4e67f9] Support +svnfixes dversion in debian/watch. ++ * [00189629] Write log to /dev/null, workaround for a minor symlink ++ attack until upstream fixes it properly. (Closes: #548546) - thanks ++ to Paul Wise ++ ++ -- Bernd Zeimetz Thu, 15 Oct 2009 11:37:15 +0200 ++ ++merkaartor (0.14+svnfixes~20090912-1) unstable; urgency=low ++ ++ * [f99555b6] Remove embedded code copies while repackaging. ++ * [52bf4f9b] Updating README.source - repackaging documentation. ++ * [73513824] Imported Upstream version 0.14 (Closes: #541534). ++ Thanks to Paul Wise for the help. ++ * [f0c575b1] Merge commit 'upstream/0.14' ++ * [a4d4df87] Merge commit 'remotes/origin/upstream-svn/merkaartor- ++ 0.14-fixes' into upstream ++ * [764565d9] Removing embedded source copies. ++ * [e9d2c986] Merge branch 'upstream' ++ * [ab1a04df] Updating patches and debian/rules to suit 0.14. ++ * [24a6321d] Cleaning up gbp.conf. ++ * [5ac5971f] Removing backup cruft. ++ * [95193d44] Build-Deps: dropping libproj, adding libboost ++ * [43aba1e5] Move Homepage into the headers of d/control. ++ * [4cda25a0] Bumping Standards-Version to 3.8.3. ++ * [11237d62] Describing merge of fixes from svn. ++ * [36e468e6] Updating debian/copyright. ++ ++ -- Bernd Zeimetz Sun, 13 Sep 2009 00:52:12 +0200 ++ ++merkaartor (0.13.2-2) unstable; urgency=low ++ ++ * [fb902c95] Disable PROJ on build until it is fixed. (Closes: ++ #536780, #528562) - thanks to James Umbanhowar and Сергей Пушкин ++ ++ -- Bernd Zeimetz Fri, 17 Jul 2009 00:59:21 +0200 ++ ++merkaartor (0.13.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ - Now it is possible to add comments to changesets (Closes: #525337). ++ * Updating patches to fit the new version. ++ * Don't install translations, they don't exist in the source. ++ * Drop dh_installexamples, examples were removed. ++ * Changes based on a patch by Per Hansen: ++ - Updated URL in debian/copyright ++ Closes: #525503 ++ * Adding git-buildpackage config file. ++ * 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. ++ * 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. ++ ++ -- Bernd Zeimetz Sun, 03 May 2009 01:21:16 +0200 ++ ++merkaartor (0.13.1-1) unstable; urgency=low ++ ++ * New upstream version - bugfix release: ++ - FIX : in Name property inspector causes AV ++ - FIX : English language warning ++ - FIX : proper handling of the "Don't connect GPX nodes..." disabling. ++ - FIX : Fit the style editor in 1024x600 resolution ++ - FIX : Reflect in dirty dock the fact that multiple objects were ++ changed together ++ * debian/patches: Updating patches for new version. ++ * debian/rules: ++ - don't try to chmod files in usr/share/merkaartor/world_shp, ++ the files don't exist anymore there. ++ ++ -- Bernd Zeimetz Sun, 12 Apr 2009 00:40:16 +0200 ++ ++merkaartor (0.13-1) unstable; urgency=low ++ ++ * New upstream version. ++ * debian/control: ++ - Adding libgdal1-dev as build dependency. ++ - Updating homepage url. ++ - Switching Maintainers and Uploaders as requested by ++ Christoph Berg. ++ - Bumping Standards-Version to 3.8.1. ++ * debian/patches: ++ - Adding gdal-config patch to use gdal-config to find libs ++ and cflags. ++ * debian/copyright: ++ - Link GPL2 properly. ++ - Update Copyright of the packaging. ++ * debian/rules: ++ - Make files in /usr/share/merkaartor/world_shp/ non-executable. ++ * debian/README.source: ++ - Adding file as required by policy. ++ ++ -- Bernd Zeimetz Thu, 19 Mar 2009 14:25:26 +0100 ++ ++merkaartor (0.12+svn13563-1) experimental; urgency=low ++ ++ * Updating to latest svn revision. ++ * debian/rules: Using new translations path, thanks to Per Hansen ++ for the report. ++ ++ -- Bernd Zeimetz Fri, 06 Feb 2009 15:23:57 +0100 ++ ++merkaartor (0.12+svn13050-1) experimental; urgency=low ++ ++ * Updating to the latest svn revision. ++ ++ -- Bernd Zeimetz Fri, 09 Jan 2009 01:09:01 +0100 ++ ++merkaartor (0.12-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Uploading to unstable again. ++ * debian/watch: ++ - Chainging URLs to point to the new upstream homepage - merkaartor.org. ++ ++ -- Bernd Zeimetz Wed, 15 Oct 2008 18:01:50 +0200 ++ ++merkaartor (0.12~svn11021-2) experimental; urgency=low ++ ++ * Updating to the latest svn revision, includes KML support. ++ ++ -- Bernd Zeimetz Thu, 02 Oct 2008 15:47:00 +0200 ++ ++merkaartor (0.12~svn10948-1) experimental; urgency=low ++ ++ * Updating to the latest svn revision. ++ ++ -- Bernd Zeimetz Tue, 16 Sep 2008 00:42:43 +0200 ++ ++merkaartor (0.12~svn10696-1) experimental; urgency=low ++ ++ * Updating to the latest svn revision. Includes a fix for a segfault ++ which happened on upload sometimes. ++ * debian/rules: ++ - Updating get-orig-source-svn: webkit is not pulled in as external ++ source anymore, so there's no need to remove it. ++ ++ -- Bernd Zeimetz Sat, 06 Sep 2008 16:47:59 +0200 ++ ++merkaartor (0.12~svn10486-1) experimental; urgency=low ++ ++ * Updating our version numbers to suit upstream's numbering again. ++ * debian/control: ++ - Adding libexiv2-dev to build dependencies. ++ - Bumping Standards-Version to 3.8.0, no changes needed. ++ * debian/rules: ++ - Using GEOIMAGE=1 as option to qmake to Support GeoTagged images. ++ ++ -- Bernd Zeimetz Thu, 04 Sep 2008 22:48:25 +0200 ++ ++merkaartor (0.0.12~svn10441-2) experimental; urgency=low ++ ++ * debian/rules: ++ - make install still does not install the translations, taking ++ care of that again. ++ ++ -- Bernd Zeimetz Wed, 03 Sep 2008 21:47:55 +0200 ++ ++merkaartor (0.0.12~svn10441-1) experimental; urgency=low ++ ++ * debian/rules: ++ - Adding NOWEBKIT=1 option to the qmake call as we use webkit from qt4. ++ - Adding PREFIX=/usr option to the qmake call so we're able to use ++ 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. ++ - Adding get-orig-source target which uses uscan to download and ++ repackage upstream's tarball. ++ - Installing icons and desktop file. ++ - Using make install instead of manually copying the files. ++ * debian/control: ++ - Adding myself to Uploaders. ++ - Adding a versioned dependency for libqt4-dev as we need webkit ++ in qt4. ++ - Adding sharutils as build dependency. ++ - Updating Description. ++ * debian/patches: ++ - Removing gcc-4.3-cast, patched code was removed by upstream. ++ * debian/{prerm,docs,postinst}: ++ - Removing files, not needed anymore. ++ * debian/merkaartor.png.b64: ++ - Adding file, created from Icons/Mercator_large.xcf using The Gimp, ++ base64 encoded using uuencode -m. ++ * debian/merkaartor.desktop: ++ - Adding file. ++ * debian/menu: ++ - Configuring icon. ++ * debian/watch, debian/uscan_repack.sh: ++ - Updating upstream URL ++ - Adding debian/uscan_repack.sh which is called by uscan to repack ++ the upstream tarball, which contains an embedded copy of Qt's ++ webkit and upstream's debian folder - both are removed. ++ ++ -- Bernd Zeimetz Wed, 03 Sep 2008 01:10:24 +0200 ++ ++merkaartor (0.0.11~svn7913-2) unstable; urgency=low ++ ++ * Explicitly call qmake-qt4. (Closes: #495807) ++ ++ -- Christoph Berg Sat, 23 Aug 2008 13:46:25 +0200 ++ ++merkaartor (0.0.11~svn7913-1) unstable; urgency=low ++ ++ * New upstream snapshot (as native package, make dist is broken). ++ + Fixes incompatibility with Qt4.3. (Closes: #478173) ++ * Install and enable translations. ++ * Use quilt. ++ * Put parentheses around a cast to make it compile with gcc-4.3 on armel. ++ ++ -- Christoph Berg Sat, 24 May 2008 16:41:53 +0200 ++ ++merkaartor (0.0.10-1) unstable; urgency=low ++ ++ * New upstream release ++ * Add watch file. ++ ++ -- Christoph Berg Sun, 06 Apr 2008 11:52:21 +0200 ++ ++merkaartor (0.0.9-2) unstable; urgency=low ++ ++ * Initial Debian upload. (Closes: #452703) ++ ++ -- Christoph Berg Thu, 28 Feb 2008 21:43:40 +0100 ++ ++merkaartor (0.0.9-1) gutsy; urgency=low ++ ++ * Upgrade to 0.0.9 ++ ++ -- Bart Vanhauwaert Fri, 04 Jan 2008 16:00:38 +0100 ++ ++merkaartor (0.0.8-1) gutsy; urgency=low ++ ++ * Upgrade to version 0.0.8. Works with OpenStreetMap API 0.5 ++ ++ -- Bart Vanhauwaert Mon, 05 Nov 2007 22:38:06 +0100 ++ ++merkaartor (0.0.7-1) feisty; urgency=low ++ ++ * Upgrade to version 0.0.7 ++ ++ -- Bart Vanhauwaert Sat, 18 Aug 2007 18:04:49 +0200 ++ ++merkaartor (0.0.6-1) unstable; urgency=low ++ ++ * Upgrade to version 0.0.6 ++ ++ -- Bart Vanhauwaert Wed, 6 Dec 2006 17:59:51 +0100 ++ ++merkaartor (0.0.5-1) unstable; urgency=low ++ ++ * Upgrade to version 0.0.5 ++ ++ -- Bart Vanhauwaert Thu, 16 Nov 2006 14:58:21 +0100 ++ ++merkaartor (0.0.4-1) unstable; urgency=low ++ ++ * Initial release ++ ++ -- Bart Vanhauwaert Sat, 28 Oct 2006 12:59:04 +0200 diff --cc debian/control index 0000000,0000000..60ecf8b new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,49 @@@ ++Source: merkaartor ++Maintainer: Debian GIS Project ++Uploaders: Jerome Benoit ++Section: science ++Priority: optional ++Build-Depends: debhelper-compat (= 13), ++ libboost-dev, ++ libboost-math-dev, ++ libboost-serialization-dev, ++ libexiv2-dev, ++ libgdal-dev, ++ libgps-dev, ++ libproj-dev, ++ libproxy-dev, ++ libqt5svg5-dev, ++ libquazip5-dev, ++ libspatialite-dev, ++ libxml2-dev, ++ libxslt1-dev, ++ qt5-qmake, ++ qt5-qmake:native, ++ qtbase5-dev, ++ qttools5-dev-tools, ++ qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], ++ sharutils, ++ zlib1g-dev ++Standards-Version: 4.5.1 ++Vcs-Browser: https://salsa.debian.org/debian-gis-team/merkaartor ++Vcs-Git: https://salsa.debian.org/debian-gis-team/merkaartor.git ++Homepage: http://www.merkaartor.be/ ++Rules-Requires-Root: no ++ ++Package: merkaartor ++Architecture: any ++Depends: ${shlibs:Depends}, ++ ${misc:Depends} ++Suggests: spatialite-bin ++Description: map editor for OpenStreetMap.org ++ Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the ++ whole world. ++ . ++ Features: ++ * download from and upload to the OpenStreetMap server ++ * open .osm and .gpx files ++ * create and move trackpoints, ways, and areas ++ * add tags, delete features ++ * reverse, split and join ways ++ * visualize some leisure/landuse areas and road types ++ * displaying GPS information diff --cc debian/copyright index 0000000,0000000..fd9e3a4 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,173 @@@ ++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 ++Files-Excluded: ++ windows ++ ci ++ .tx ++ .indent.pro ++ .gitattributes ++ .gitignore ++ .travis.yml ++ .github ++ LICENSE.rtf ++ ++Files: * ++Copyright: 2005, Robin Gingras ++ 2007, Kai Winter ++ 2008, Łukasz Jernaś ++ 2008, Travers Carter ++ 2010, Christian Vetter ++ 2010, James Hogan ++ 2006-2016, Bart Vanhauwaert ++ 2006-2016, Chris Browet ++ 2006-2016, Ladislav Láska ++License: GPL-3+ ++Comment: ++ The upstream source is distributed under the license GPL-2+, however ++ it contains some LGPL-3+ and GPL-3+ material. Therefore, by combination ++ (cf. ) its ++ effective license is GPL-3+. ++ ++Files: ++ 3rdparty/qtsingleapplication-2.6_1-opensource/* ++ src/QToolBarDialog/qttoolbardialog.cpp ++ src/QToolBarDialog/qttoolbardialog.h ++ Icons/QToolBarDialog/* ++Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) ++License: QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 ++Comment: ++ The or-chain of licenses if the one found in the qttoolbardialog.{h,cpp} ++ C++ sources. Second, there is no explicit license for the icons, but the ++ history of the upstream GIT repository indicates that they cames along the ++ qttoolbardialog.{h,cpp} C++ sources. This is old material, and the original ++ source ball could not be found. ++ ++Files: ++ src/ImportExport/fileformat.proto ++ src/ImportExport/osmformat.proto ++Copyright: 2010, Scott A. Crosby. ++License: LGPL-3+ ++ ++Files: plugins/background/MCadastreFranceBackground/qadastre/* ++Copyright: 2010, Pierre Ducroquet ++License: GPL-3+ ++ ++Files: src/org.merkaartor.merkaartor.appdata.xml ++Copyright: n/a ++License: CC0-1.0 ++ ++Files: Icons/Mapnik/* ++Copyright: n/a ++License: public-domain ++ These files are an heteroclite collection of PNG images whose each info part ++ contains no copyright notice. ++ ++Files: debian/* ++Copyright: 2006, bart ++ 2008, Christoph Berg ++ 2008-2009, Bernd Zeimetz ++ 2020-2021, Jerome Benoit ++License: GPL-3+ ++ ++License: GPL-3 ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License version 3 as published ++ by the Free Software Foundation. ++ . ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ . ++ On Debian systems, the complete text of the GNU General ++ Public License can be found in `/usr/share/common-licenses/GPL-3'. ++ ++License: GPL-3+ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ . ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ . ++ On Debian systems, the complete text of the GNU General Public License ++ version 3 can be found in `/usr/share/common-licenses/GPL-3'. ++ ++License: LGPL-3+ ++ This package is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 3 of the License, or (at your option) any later version. ++ . ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ . ++ You should have received a copy of the GNU Lesser General Public License ++ along with this program. If not, see . ++ . ++ On Debian systems, the complete text of the GNU Lesser General ++ Public License can be found in `/usr/share/common-licenses/LGPL-3'. ++ ++License: CC0-1.0 ++ To the extent possible under law, the author(s) have dedicated all ++ copyright and related and neighboring rights to this software to the public ++ domain worldwide. This software is distributed without any warranty. ++ . ++ On Debian systems the full text of the CC0-1.0 license can be found in ++ /usr/share/common-licenses/CC0-1.0 ++ ++License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 ++ Alternatively, this file may be used under the terms of the GNU Lesser ++ General Public License version 2.1 as published by the Free Software ++ Foundation and appearing in the file LICENSE.LGPL included in the ++ packaging of this file. Please review the following information to ++ ensure the GNU Lesser General Public License version 2.1 requirements ++ will be met: . ++ . ++ In addition, as a special exception, Digia gives you certain additional ++ rights. These rights are described in the Digia Qt LGPL Exception ++ version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++ . ++ Digia Qt LGPL Exception version 1.1 ++ As an additional permission to the GNU Lesser General Public License version ++ 2.1, the object code form of a "work that uses the Library" may incorporate ++ material from a header file that is part of the Library. You may distribute ++ such object code under terms of your choice, provided that: ++ (i) the header files of the Library have not been modified; and ++ (ii) the incorporated material is limited to numerical parameters, data ++ structure layouts, accessors, macros, inline functions and ++ templates; and ++ (iii) you comply with the terms of Section 6 of the GNU Lesser General ++ Public License version 2.1. ++ . ++ Moreover, you may apply this exception to a modified version of the Library, ++ provided that such modification does not involve copying material from the ++ Library into the modified Library's header files unless such material is ++ limited to (i) numerical parameters; (ii) data structure layouts; ++ (iii) accessors; and (iv) small macros, templates and inline functions of ++ five lines or less in length. ++ . ++ Furthermore, you are not required to apply this additional permission to a ++ modified version of the Library. ++ ++License: QT-Commercial ++ Commercial License Usage ++ Licensees holding valid commercial Qt licenses may use this file in ++ accordance with the commercial license agreement provided with the ++ Software or, alternatively, in accordance with the terms contained in ++ a written agreement between you and Digia. For licensing terms and ++ conditions see http://qt.digia.com/licensing. For further information ++ use the contact form at . diff --cc debian/docs index 0000000,0000000..8ed9163 new file mode 100644 --- /dev/null +++ b/debian/docs @@@ -1,0 -1,0 +1,2 @@@ ++AUTHORS ++CREDITS diff --cc debian/gbp.conf index 0000000,0000000..e3daba6 new file mode 100644 --- /dev/null +++ b/debian/gbp.conf @@@ -1,0 -1,0 +1,19 @@@ ++[DEFAULT] ++ ++# The default name for the upstream branch is "upstream". ++# Change it if the name is different (for instance, "master"). ++upstream-branch = upstream ++ ++# The default name for the Debian branch is "master". ++# Change it if the name is different (for instance, "debian/unstable"). ++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 ++upstream-tag = upstream/%(version)s ++ ++# Always use pristine-tar. ++pristine-tar = True ++ ++[buildpackage] ++pbuilder-options = --source-only-changes diff --cc debian/merkaartor.1 index 0000000,0000000..f40e2a1 new file mode 100644 --- /dev/null +++ b/debian/merkaartor.1 @@@ -1,0 -1,0 +1,22 @@@ ++.TH MERKAARTOR 1 ++.SH NAME ++Merkaartor \- map editor for OpenStreetMap.org ++.SH SYNOPSIS ++.B merkaartor ++.SH DESCRIPTION ++Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the ++whole world. ++.SH OPTIONS ++None. ++.SH "SEE ALSO" ++viking(1). ++.SH AUTHORS ++Bart Vanhauwaert, ++Elrond, ++Oliver Heesakkers, ++Patric Cameron, ++Geoff Richards, ++Raphael Studer, ++Matt Williams, ++Chris Browet, ++Daniel van Gerpen. diff --cc debian/patches/no-git-version.patch index 0000000,0000000..2caec09 new file mode 100644 --- /dev/null +++ b/debian/patches/no-git-version.patch @@@ -1,0 -1,0 +1,16 @@@ ++Description: Extract version from CHANGELOG, not git. ++Author: Bas Couwenberg ++Forwarded: not-needed ++ ++--- a/src/Config.pri +++++ b/src/Config.pri ++@@ -1,7 +1,7 @@ ++ # see http://merkaartor.be/wiki/merkaartor/Compiling ++ ++-REVISION = $$system( git describe --tags ) ++-VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" ) +++REVISION = "" +++VERSION = "" ++ isEmpty( REVISION ) { ++ REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'") ++ VERSION = $$REVISION diff --cc debian/patches/qmake-config-nostrip.patch index 0000000,0000000..0ba8333 new file mode 100644 --- /dev/null +++ b/debian/patches/qmake-config-nostrip.patch @@@ -1,0 -1,0 +1,54 @@@ ++Description: Add nostrip to CONFIG for debug package. ++Author: Bas Couwenberg ++Forwarded: not-needed ++ ++--- a/Merkaartor.pro +++++ b/Merkaartor.pro ++@@ -1,4 +1,4 @@ ++-CONFIG += debug_and_release +++CONFIG += debug_and_release nostrip ++ TEMPLATE = subdirs ++ SUBDIRS += src \ ++ plugins ++--- a/plugins/background/background.pro +++++ b/plugins/background/background.pro ++@@ -1,6 +1,6 @@ ++ TEMPLATE = subdirs ++ ++-CONFIG += debug_and_release +++CONFIG += debug_and_release nostrip ++ ++ #Qt Version ++ QT_VERSION = $$[QT_VERSION] ++--- a/plugins/common.pri +++++ b/plugins/common.pri ++@@ -10,7 +10,7 @@ ++ ++ MERKAARTOR_SRC_DIR = $$PWD/.. ++ ++-CONFIG += debug_and_release +++CONFIG += debug_and_release nostrip ++ # avoid deprecation warnings which 5.15 introduced. ++ DEFINES += QT_NO_DEPRECATED_WARNINGS ++ ++--- a/plugins/plugins.pro +++++ b/plugins/plugins.pro ++@@ -1,6 +1,6 @@ ++ TEMPLATE = subdirs ++ ++-CONFIG += debug_and_release +++CONFIG += debug_and_release nostrip ++ ++ SUBDIRS += background ++ # qtstyle ++--- a/src/src.pro +++++ b/src/src.pro ++@@ -6,7 +6,7 @@ ++ #Custom config ++ include(Custom.pri) ++ ++-CONFIG += debug_and_release c++11 +++CONFIG += debug_and_release c++11 nostrip ++ # avoid deprecation warnings which 5.15 introduced. ++ DEFINES += QT_NO_DEPRECATED_WARNINGS ++ diff --cc debian/patches/series index 0000000,0000000..618e4c2 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,2 @@@ ++qmake-config-nostrip.patch ++no-git-version.patch diff --cc debian/rules index 0000000,0000000..41cd9bd new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,55 @@@ ++#!/usr/bin/make -f ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# Enable hardening build flags ++export DEB_BUILD_MAINT_OPTIONS=hardening=+all ++ ++# Use Qt5 ++export QT_SELECT=5 ++ ++DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) ++ ++ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mipsel)) ++DEB_PKG_USEWEBENGINE=1 ++else ++DEB_PKG_USEWEBENGINE=0 ++endif ++ ++ ++%: ++ dh $@ --buildsystem=qmake ++ ++override_dh_auto_clean: ++ dh_auto_clean ++ cd translations && make clean ++ ++override_dh_clean: ++ dh_clean ++ rm -rf binaries ++ ++override_dh_auto_configure: ++ cd translations && make release ++ dh_auto_configure -- -recursive \ ++ Merkaartor.pro \ ++ TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \ ++ GDAL=1 \ ++ GEOIMAGE=1 \ ++ GPSDLIB=1 \ ++ LIBPROXY=1 \ ++ NOWEBKIT=1 \ ++ PROJ=1 \ ++ SPATIALITE=0 \ ++ SYSTEM_QUAZIP=1 \ ++ SYSTEM_QUAZIP_LDFLAGS="-lquazip5" \ ++ USEWEBENGINE=$(DEB_PKG_USEWEBENGINE) \ ++ ZBAR=0 \ ++ NODEBUG=1 \ ++ RELEASE=1 ++ ++override_dh_installchangelogs: ++ dh_installchangelogs CHANGELOG ++ ++override_dh_installman: ++ dh_installman debian/merkaartor.1 diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/lintian-overrides index 0000000,0000000..4e126af new file mode 100644 --- /dev/null +++ b/debian/source/lintian-overrides @@@ -1,0 -1,0 +1,5 @@@ ++# GitHub source ball ++debian-watch-does-not-check-gpg-signature ++ ++# third party examples ++package-does-not-install-examples diff --cc debian/upstream/metadata index 0000000,0000000..fb7e016 new file mode 100644 --- /dev/null +++ b/debian/upstream/metadata @@@ -1,0 -1,0 +1,5 @@@ ++--- ++Bug-Database: https://github.com/openstreetmap/merkaartor/issues ++Bug-Submit: https://github.com/openstreetmap/merkaartor/issues/new ++Repository: https://github.com/openstreetmap/merkaartor.git ++Repository-Browse: https://github.com/openstreetmap/merkaartor diff --cc debian/watch index 0000000,0000000..7c137f9 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,8 @@@ ++version=4 ++opts=\ ++repack,compression=xz,repacksuffix=+ds,\ ++dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ ++uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g,\ ++filenamemangle=s/(?:.*\/)?(?:rel|v|merkaartor)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/merkaartor-$1.$2/ \ ++https://github.com/openstreetmap/merkaartor/releases \ ++(?:.*?/archive/(?:.*?/)?)?(?:rel|v|merkaartor)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))