[med-svn] r15767 - trunk/packages/trimmomatic/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-01-13 16:59:57 +0000 (Mon, 13 Jan 2014)
New Revision: 15767

Modified:
   trunk/packages/trimmomatic/trunk/debian/changelog
   trunk/packages/trimmomatic/trunk/debian/control
   trunk/packages/trimmomatic/trunk/debian/get-orig-source
Log:
Trust new uscan to create clean upstream source tarball; normalise d/control


Modified: trunk/packages/trimmomatic/trunk/debian/changelog
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/changelog	2014-01-13 16:13:13 UTC (rev 15766)
+++ trunk/packages/trimmomatic/trunk/debian/changelog	2014-01-13 16:59:57 UTC (rev 15767)
@@ -1,8 +1,11 @@
-trimmomatic (0.30+dfsg-2) UNRELEASED; urgency=low
+trimmomatic (0.32+dfsg-1) UNRELEASED; urgency=low
 
   * debian/copyright: Fix contact and copyright
+  * debian/get-orig-source: Trust new uscan to create clean upstream source
+    tarball
+  * debian/control: cme fix dpkg-control
 
- -- Andreas Tille <tille at debian.org>  Thu, 08 Aug 2013 19:18:10 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 13 Jan 2014 18:00:20 +0100
 
 trimmomatic (0.30+dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/trimmomatic/trunk/debian/control
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/control	2014-01-13 16:13:13 UTC (rev 15766)
+++ trunk/packages/trimmomatic/trunk/debian/control	2014-01-13 16:59:57 UTC (rev 15767)
@@ -5,11 +5,11 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               default-jdk | openjdk-6-jdk | openjdk-7-jdk,
+               default-jdk | openjdk-7-jdk,
                javahelper,
                ant,
                libjbzip2-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/trimmomatic/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/trimmomatic/trunk/
 Homepage: http://www.usadellab.org/cms/index.php?page=trimmomatic
@@ -41,4 +41,3 @@
  depending on the Illumina pipeline used), either uncompressed or
  gzipp'ed FASTQ. Use of gzip format is determined based on the .gz
  extension.
-

Modified: trunk/packages/trimmomatic/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/trimmomatic/trunk/debian/get-orig-source	2014-01-13 16:13:13 UTC (rev 15766)
+++ trunk/packages/trimmomatic/trunk/debian/get-orig-source	2014-01-13 16:59:57 UTC (rev 15767)
@@ -7,31 +7,5 @@
     exit
 fi
 
-set -e
-NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-UNAME=`echo $NAME | sed -e 's/^t/T/' -e 's/$/-Src/'`
+uscan --verbose --force-download 
 
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    uscan --force-download
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${UAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
-
-TARDIR=${NAME}-${VERSION}
-
-mkdir -p ../tarballs
-cd ../tarballs
-unzip -q ../${UNAME}-${VERSION}.zip
-
-# clean up unneeded binary jars
-rm -rf ${TARDIR}/lib/*.jar
-# No need to keep copies of old code
-rm -rf ${TARDIR}/old
-
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.gz "${TARDIR}"
-rm -rf "${TARDIR}"