Package: merkaartor Version: 0.18.1-3+b6 Tags: patch Followup-For: Bug #731118
Hi Bernd, The attached patch contains updates for the new Merkaartor upstream development by the OpenStreetMap community. The Homepage URL is updated to www.merkaartor.be, and the watch file is updated to use the GitHub releases. Maybe it's a good idea to move merkaartor under the Debian GIS umbrella where it can benefit from more team maintenance. Kind Regards, Bas
>From 6cfeb08eb96b052bd535e315f4c7dac554e9cc60 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun, 19 Jul 2015 17:13:46 +0200 Subject: Updates for new upstream development by the OpenStreetMap community. - Update watch file for move to GitHub. - Update Homepage URL to www.merkaartor.be. --- debian/control | 2 +- debian/watch | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 4922fa1..77ecded 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7), quilt, zlib1g-dev, Standards-Version: 3.8.4 Vcs-Git: git://git.recluse.de/debian/pkg-merkaartor.git Vcs-Browser: http://git.recluse.de/repos/debian/pkg-merkaartor.git -Homepage: http://www.merkaartor.org/ +Homepage: http://www.merkaartor.be/ Package: merkaartor Architecture: any diff --git a/debian/watch b/debian/watch index 347472f..a109f33 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,7 @@ version=3 -opts=dversionmangle=s/\+svnfixes~[0-9]*$// \ -http://www.merkaartor.org/Download/ .*/downloads/source/merkaartor-(.*)\.tar\.bz2 debian debian/uscan_repack.sh +opts=\ +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 \ +(?:.*/)?(?:rel|v|merkaartor)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- 2.1.4
