[SCM] freeplane packaging branch, master, updated. upstream/1.2.23-49-gf1085f2

[Felix Natter]

The following commit has been merged in the master branch:
commit f1085f2ad6a9f121741230579eb2174a815829db
Author: Felix Natter <fnatter at gmx.net>
Date:   Fri Apr 12 18:32:20 2013 +0200

    re-add 'get-orig-source' target, fix debian/watch so that download is named correctly

diff --git a/debian/README.source b/debian/README.source
index f8858b5..23a989f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,10 +3,5 @@ freeplane for Debian
 
 The latest (stable) version of freeplane can be downloaded from here:
   http://sourceforge.net/projects/freeplane/files/freeplane%20stable/
-
-debian/watch uses a hack to search only the "freeplane stable" directory
-for new releases (and therefore does NOT use the usual sourceforge
-redirector). As a result of this, "uscan --[force-]download" will name the
-download 'download'.
-=> Hence the 'get-orig-source' (uscan --force-download ...) target has been
-removed from debian/rules.
+OR using:
+  $ debian/rules get-orig-source
diff --git a/debian/rules b/debian/rules
index 1c29c7c..aac174c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,3 +31,7 @@ clean::
 
 #buildxml-clean::
 #	-$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
+
+# Get original sources directly using uscan
+get-orig-source:
+	uscan --force-download --rename --repack
diff --git a/debian/watch b/debian/watch
index a345f60..acd9972 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,7 +3,8 @@
 # from Bart Martens <bartm at debian.org>  Sat, 23 Feb 2013 18:28:01 +0000
 # and Felix Natter <fnatter at gmx.net> Fri, 22 Mar 2013 18:56:23
 # the uversionmangle is necessary to remove minor versions, i.e. 1.2.22_05->1.2.22
+# the filenamemangle is needed to make sure that uscan names the download correctly
 
 version=3
-opts=dversionmangle=s/\+dfsg1//,uversionmangle=s/_[0-9]+$// \
+opts=filenamemangle=s/.*\/(.*)\/download/$1/,dversionmangle=s/\+dfsg1//,uversionmangle=s/_[0-9]+$// \
 http://sourceforge.net/projects/freeplane/files/freeplane%20stable/ .*/freeplane_srcpure-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))/download

-- 
freeplane packaging