[med-svn] r14976 - trunk/packages/imagej/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-10-25 13:04:27 +0000 (Fri, 25 Oct 2013)
New Revision: 14976

Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/get-orig-source
   trunk/packages/imagej/trunk/debian/watch
Log:
Use enhanced uscan if available


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2013-10-25 12:59:37 UTC (rev 14975)
+++ trunk/packages/imagej/trunk/debian/changelog	2013-10-25 13:04:27 UTC (rev 14976)
@@ -1,10 +1,12 @@
-imagej (1.47b-1) UNRELEASED; urgency=low
+imagej (1.48e+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream version
   * debian/copyright:
      - DEP5
      - Add Files-Excluded to document what was removed from original source
   * debian/imagej.sh: Do not bloat our mailing list with mails
+  * debian/get-orig-source: Use enhanced uscan if available
+  * debian/watch: mangle +dfsg in version number
 
  -- Andreas Tille <tille at debian.org>  Fri, 25 Oct 2013 15:02:25 +0200
 

Modified: trunk/packages/imagej/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/imagej/trunk/debian/get-orig-source	2013-10-25 12:59:37 UTC (rev 14975)
+++ trunk/packages/imagej/trunk/debian/get-orig-source	2013-10-25 13:04:27 UTC (rev 14976)
@@ -1,4 +1,15 @@
 #!/bin/sh -e
+
+# Remark: A new uscan that enables easier handling of removing files can be
+#         obtained via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
+if uscan --help | grep -q -- --repack-compression ; then
+    echo "Use new enhanced uscan"
+    uscan --verbose --force-download --repack-compression xz
+    exit
+fi
+
 # Upstream provides source in ZIP file so we have to repack anyway and
 # thus it seems reasonable to remove some binary cruft
 

Modified: trunk/packages/imagej/trunk/debian/watch
===================================================================
--- trunk/packages/imagej/trunk/debian/watch	2013-10-25 12:59:37 UTC (rev 14975)
+++ trunk/packages/imagej/trunk/debian/watch	2013-10-25 13:04:27 UTC (rev 14976)
@@ -1,6 +1,6 @@
 # watch control file for imagej
 version=3
 
-opts="uversionmangle=s/(\d)+(\d\d)/$1.$2/" \
+opts="uversionmangle=s/(\d)+(\d\d)/$1.$2/,dversionmangle=s/[~\+]dfsg//" \
 http://imagej.nih.gov/ij/download/src/ij(\d+.)-src.zip \
   debian debian/get-orig-source