[SCM] lash packaging branch, master-experimental, updated. debian/0.5.4.0-2-17-g967b8ae

js at users.alioth.debian.org js at users.alioth.debian.org
Sun May 16 09:44:40 UTC 2010


The following commit has been merged in the master-experimental branch:
commit 6671e54171d5bd3492ed2f4b4e9c1248ee82c3cf
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun May 16 11:36:09 2010 +0200

    Watch file cleanup: drop no longer needed dversionmangle (workaround for rerelease of 0.5.4).

diff --git a/debian/rules b/debian/rules
index 76edfa5..1135ec8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_UPSTREAM_URL = http://download.savannah.gnu.org/releases/lash
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
 
-# 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/
-
 # Avoid PNG files upsetting dpkg-source
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^\./(icons/.*\.png|debian/(changelog|copyright(|_hints|_newhints)))$
 
diff --git a/debian/watch b/debian/watch
index 300f469..cc88b22 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 # Run the "uscan" command to check for upstream updates and more.
 version=3
-opts=uversionmangle=s/%7E/~/,dversionmangle=s/0\.5\.4\.0/0.5.4/ \
+opts=uversionmangle=s/%7E/~/ \
  http://download.savannah.gnu.org/releases/lash/lash-(.*)\.tar\.bz2

-- 
lash packaging



More information about the pkg-multimedia-commits mailing list