[SCM] lash packaging branch, master, updated. upstream/0.5.4-7-g2d35379

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9113346505235e615b79182290f6d9b0c9a54423
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 17 23:47:39 2010 +0200

    Add version hacks to watch and rules files to handle rerelease of 0.5.4 as 0.5.4.0 to properly get rid of tarball-in-tarball packaging.

diff --git a/debian/rules b/debian/rules
index 021afbb..b40e8fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_UPSTREAM_URL = http://download.savannah.gnu.org/releases/lash
 
+# TODO: Drop this hack (and that in watch file) after next upstream release
+DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/0\.5\.4\.0/0.5.4/
+
 clean::
 	-rm -rf build-tree/lash-*/docs/lash-manual-html-split/lash-manual
 
diff --git a/debian/watch b/debian/watch
index 6af6261..42b2ef4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
 
-http://download.savannah.gnu.org/releases/lash/lash-(.*)\.tar\.gz
+opts=dversionmangle=s/0\.5\.4\.0/0.5.4/ \
+ http://download.savannah.gnu.org/releases/lash/lash-(.*)\.tar\.gz

-- 
lash packaging