[SCM] Packaging for original LIERO binary data branch, master, updated. upstream/1.33-24-gc6ae2cf

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit e4cd2a03c3462cdd4f3f61c959f607a31910500a
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Fri Jan 20 16:49:11 2012 +0100

    More adaptation of get-orig and watch file

diff --git a/debian/rules b/debian/rules
index 5b8fc07..db64fa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,11 @@ override_dh_auto_build:
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-DIR=liero-data_$(VER).orig
-USCAN_TAR=liero-data_$(VER).orig.tar.gz
-TAR=liero-data_$(VER).orig.tar.bz2
+UVER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DUVER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+DIR=liero-data_$(DUVER).orig
+USCAN_TAR=liero-data_$(UVER).orig.tar.gz
+TAR=liero-data_$(DUVER).orig.tar.bz2
 get-orig-source:
 	rm -rf $(USCAN_TAR)
 	rm -rf $(DIR)
diff --git a/debian/watch b/debian/watch
index 8c41ddf..4e445bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 # I doubt this serves any purpose other than shutting up lintian
 version=3
-opts=uversionmangle=s/(\d{1})(\d{2})/$1\.$2/ \
- http://www.liero.be (?:.*/)?lierov(\d+).*\.zip
+opts=uversionmangle=s/(\d{1})(\d{2})/$1\.$2/,dversionmangle=s/\+ds\d+// \
+	http://www.liero.be (?:.*/)?lierov(\d+).*\.zip

-- 
Packaging for original LIERO binary data