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

[Andreas Tille]

Author: tille
Date: 2014-07-07 12:54:06 +0000 (Mon, 07 Jul 2014)
New Revision: 17410

Removed:
   trunk/packages/imagej/trunk/debian/get-orig-source
Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/rules
   trunk/packages/imagej/trunk/debian/watch
Log:
Use uscan with Files-Excluded instead of get-orig-source


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2014-07-07 08:38:42 UTC (rev 17409)
+++ trunk/packages/imagej/trunk/debian/changelog	2014-07-07 12:54:06 UTC (rev 17410)
@@ -1,3 +1,9 @@
+imagej (1.48s+dfsg-2) UNRELEASED; urgency=medium
+
+  * Remove get-orig-source in favour of Files-Excluded
+
+ -- Andreas Tille <tille at debian.org>  Mon, 07 Jul 2014 14:42:24 +0200
+
 imagej (1.48s+dfsg-1) unstable; urgency=medium
 
   * New upstream version

Deleted: trunk/packages/imagej/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/imagej/trunk/debian/get-orig-source	2014-07-07 08:38:42 UTC (rev 17409)
+++ trunk/packages/imagej/trunk/debian/get-orig-source	2014-07-07 12:54:06 UTC (rev 17410)
@@ -1,52 +0,0 @@
-#!/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
-
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-ORIGNAME=ij
-
-if ! echo $@ | grep -q upstream-version ; then
-    DVERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-else
-    DVERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+[a-z]\) .*${ORIGNAME}.*-src\.zip?\1?"`
-    if echo "$DVERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
-
-UVERSION=${ORIGNAME}`echo ${DVERSION} | sed 's/\.//'`
-UPSTREAMZIP=${UVERSION}-src.zip
-
-UPSTREAMDIR=source
-
-cd ..
-mkdir -p tarballs
-
-if [ ! -f "$UPSTREAMZIP" ] ; then
-    wget -q http://imagej.nih.gov/ij/download/src/"$UPSTREAMZIP"
-fi
-cd tarballs
-unzip -q ../"$UPSTREAMZIP"
-
-cd "$UPSTREAMDIR"
-# remove hidden binary files
-rm -rf .FBC*
-# remove gdb history
-rm -f .gdb_history
-
-cd ..
-mv "$UPSTREAMDIR" "$NAME"-"$DVERSION"
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$DVERSION".orig.tar.xz "$NAME"-"$DVERSION"
-rm -rf "$NAME"-"$DVERSION"

Modified: trunk/packages/imagej/trunk/debian/rules
===================================================================
--- trunk/packages/imagej/trunk/debian/rules	2014-07-07 08:38:42 UTC (rev 17409)
+++ trunk/packages/imagej/trunk/debian/rules	2014-07-07 12:54:06 UTC (rev 17410)
@@ -12,4 +12,4 @@
 	ant build
 
 get-orig-source:
-	. debian/get-orig-source
+	uscan --verbose --force-download --repack --compression xz

Modified: trunk/packages/imagej/trunk/debian/watch
===================================================================
--- trunk/packages/imagej/trunk/debian/watch	2014-07-07 08:38:42 UTC (rev 17409)
+++ trunk/packages/imagej/trunk/debian/watch	2014-07-07 12:54:06 UTC (rev 17410)
@@ -1,6 +1,5 @@
 # watch control file for imagej
 version=3
 
-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
+opts="uversionmangle=s/(\d)+(\d\d)/$1.$2+dfsg/" \
+http://imagej.nih.gov/ij/download/src/ij(\d+.)-src.zip