[med-svn] r17344 - trunk/packages/velvet/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-06-30 09:40:31 +0000 (Mon, 30 Jun 2014)
New Revision: 17344

Removed:
   trunk/packages/velvet/trunk/debian/get-orig-source
Modified:
   trunk/packages/velvet/trunk/debian/changelog
   trunk/packages/velvet/trunk/debian/rules
Log:
Base get-orig-source target on recent uscan that understands Files-Excluded


Modified: trunk/packages/velvet/trunk/debian/changelog
===================================================================
--- trunk/packages/velvet/trunk/debian/changelog	2014-06-30 09:17:03 UTC (rev 17343)
+++ trunk/packages/velvet/trunk/debian/changelog	2014-06-30 09:40:31 UTC (rev 17344)
@@ -1,3 +1,11 @@
+velvet (1.2.10+dfsg-2) UNRELEASED; urgency=medium
+
+  * Moved debian/upstream to debian/upstream/metadata
+  * Base get-orig-source target on recent uscan that understands
+    Files-Excluded
+
+ -- Andreas Tille <tille at debian.org>  Mon, 30 Jun 2014 11:36:58 +0200
+
 velvet (1.2.10+dfsg-1biolinux5) trusty; urgency=low
 
   * Rebuild for Ubuntu Trusty

Deleted: trunk/packages/velvet/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/velvet/trunk/debian/get-orig-source	2014-06-30 09:17:03 UTC (rev 17343)
+++ trunk/packages/velvet/trunk/debian/get-orig-source	2014-06-30 09:40:31 UTC (rev 17344)
@@ -1,43 +0,0 @@
-#!/bin/sh
-# script to download and repack source package of velvet
-# this is needed to remove a copy of zlib
-
-if uscan --help | grep -q -- --repack-compression ; then
-    echo "Use new enhanced uscan"
-    uscan --verbose --force-download --repack-compression xz
-    exit
-fi
-
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-VERSION=`uscan --verbose --force-download | \
-    grep "Newest version on remote site is .* local version is .*" | \
-    head -n 1 | \
-    sed "s/Newest version on remote site is \([-0-9.]\+\),.*/\1/"`
-
-mkdir -p ../tarballs
-cd ../tarballs
-
-UPSTREAMDIR="${PKG}_${VERSION}"
-mv ../${UPSTREAMDIR}.tgz .
-tar -xzf ${UPSTREAMDIR}.tgz
-rm -rf ${UPSTREAMDIR}/third-party
-
-## Delete useless binaries once we are changing the original tarball anyway
-# delete precompiled object files
-# rm -f ${UPSTREAMDIR}/obj/*.o
-find ${UPSTREAMDIR} -name "*.o" -exec rm -f \{\} \;
-# delete .DS_Store files
-find ${UPSTREAMDIR} -name .DS_Store -exec rm -f \{\} \;
-rm -rf ${UPSTREAMDIR}/contrib/MetaVelvet-1.2.01/ISGraph/*.a
-
-## remove separate project which is basically a duplication of velvet code
-## this should be packaged separately with an up to date version
-#rm -rf ${UPSTREAMDIR}/contrib/MetaVelvet*
-#  ... don't do this any more
-
-SUFFIX="+dfsg"
-mv ${UPSTREAMDIR} ${UPSTREAMDIR}${SUFFIX}
-
-rm -f ../"$PKG"_"$VERSION".orig.tar.gz
-tar -cJf ../"$PKG"_"$VERSION~nozlibcopy".orig.tar.xz "${UPSTREAMDIR}${SUFFIX}"
-rm -rf "${UPSTREAMDIR}${SUFFIX}"

Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2014-06-30 09:17:03 UTC (rev 17343)
+++ trunk/packages/velvet/trunk/debian/rules	2014-06-30 09:40:31 UTC (rev 17344)
@@ -72,4 +72,4 @@
 	dh_builddeb -- -Z xz
 
 get-orig-source:
-	. debian/get-orig-source
+	uscan --verbose --force-download --repack --compression xz