[med-svn] r19737 - trunk/packages/qiime/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-07-29 10:07:39 +0000 (Wed, 29 Jul 2015)
New Revision: 19737

Modified:
   trunk/packages/qiime/trunk/debian/rules
   trunk/packages/qiime/trunk/debian/watch
Log:
Adapt watch and get-orig-source target to new uscan


Modified: trunk/packages/qiime/trunk/debian/rules
===================================================================
--- trunk/packages/qiime/trunk/debian/rules	2015-07-29 08:30:15 UTC (rev 19736)
+++ trunk/packages/qiime/trunk/debian/rules	2015-07-29 10:07:39 UTC (rev 19737)
@@ -70,14 +70,6 @@
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.md
 
-override_dh_builddeb:
-	dh_builddeb -- -Z xz
-
-# Remark: The following uscan command requires devscripts > 2.12.4 which is not
-#         yet released at the time of this package release.  The code can be obtained
-#         via
-#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
-#         and then use scripts/uscan.pl
 get-orig-source:
 	mkdir -p ../tarballs
-	uscan --verbose --force-download  --destdir=../tarballs --repack-compression xz
+	uscan --verbose --force-download  --destdir=../tarballs --repack --compression xz

Modified: trunk/packages/qiime/trunk/debian/watch
===================================================================
--- trunk/packages/qiime/trunk/debian/watch	2015-07-29 08:30:15 UTC (rev 19736)
+++ trunk/packages/qiime/trunk/debian/watch	2015-07-29 10:07:39 UTC (rev 19737)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/$/+dfsg/ \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
   https://github.com/qiime/qiime/releases .*/qiime/archive/([.0-9]+)\.tar\.gz