r23367 - in /trunk/libnet-sftp-foreign-perl/debian: changelog repack.sh watch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Thu Jul 17 17:07:50 2008
New Revision: 23367

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23367
Log:
Replace uversionmangle with dversionmangle in debian/watch; adjust
debian/repack.sh.

Modified:
    trunk/libnet-sftp-foreign-perl/debian/changelog
    trunk/libnet-sftp-foreign-perl/debian/repack.sh
    trunk/libnet-sftp-foreign-perl/debian/watch

Modified: trunk/libnet-sftp-foreign-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sftp-foreign-perl/debian/changelog?rev=23367&op=diff
==============================================================================
--- trunk/libnet-sftp-foreign-perl/debian/changelog (original)
+++ trunk/libnet-sftp-foreign-perl/debian/changelog Thu Jul 17 17:07:50 2008
@@ -1,3 +1,10 @@
+libnet-sftp-foreign-perl (1.40+dfsg-2) UNRELEASED; urgency=low
+
+  * Replace uversionmangle with dversionmangle in debian/watch; adjust
+    debian/repack.sh.
+
+ -- gregor herrmann <gregoa at debian.org>  Thu, 17 Jul 2008 19:07:09 +0200
+
 libnet-sftp-foreign-perl (1.40+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libnet-sftp-foreign-perl/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sftp-foreign-perl/debian/repack.sh?rev=23367&op=diff
==============================================================================
--- trunk/libnet-sftp-foreign-perl/debian/repack.sh (original)
+++ trunk/libnet-sftp-foreign-perl/debian/repack.sh Thu Jul 17 17:07:50 2008
@@ -1,41 +1,46 @@
 #!/bin/sh
 # Repackage upstream source to exclude non-distributable files
-# should be called as "repack sh --upstream-source <ver> <downloaded file>
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
 # (for example, via uscan)
 
 set -e
 set -u
 
-FILE=$3
+VER="$2"
+FILE="$3"
+DVER="${VER}+dfsg"
 PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-VER=`dpkg-parsechangelog|grep ^Version:|sed 's/^Version: //; s/+dfsg-[^-]\+$//'`
 
-printf "\nRepackaging $FILE\n"
+REPACK_DIR="$PKG-$DVER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
 
 DIR=`mktemp -d ./tmpRepackXXXXXX`
-trap "rm -rf $DIR" QUIT INT EXIT
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
 
-tar xzf $FILE -C $DIR
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
 
-REPACK=`basename $FILE`
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+	# Tarball does contain a root directory
+	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
 
-UP_DIR=`ls -1 $DIR`
+## Remove stuff
+rm -vrf $UP_BASE/rfc
+sed -i '\,rfc/, D' $UP_BASE/MANIFEST
+## End
 
-(
-    set -e
-    set -u
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
 
-    cd $DIR
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
 
-    rm -vrf $UP_DIR/rfc
-
-    sed -i '\,rfc/, D' $UP_DIR/MANIFEST
-
-    REPACK_DIR="$PKG-$VER.orig"
-    mv $UP_DIR $REPACK_DIR
-    tar -c $REPACK_DIR | gzip -9 > $REPACK
-)
-
-mv $DIR/$REPACK $FILE
+mv "$DIR/repacked.tar.gz" "$FILE"
 
 echo "*** $FILE repackaged"
+
+prename --verbose --force "s/$VER/$DVER/" $FILE

Modified: trunk/libnet-sftp-foreign-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sftp-foreign-perl/debian/watch?rev=23367&op=diff
==============================================================================
--- trunk/libnet-sftp-foreign-perl/debian/watch (original)
+++ trunk/libnet-sftp-foreign-perl/debian/watch Thu Jul 17 17:07:50 2008
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/$/+dfsg/" \
+opts="dversionmangle=s/\+dfsg$//" \
 http://search.cpan.org/dist/Net-SFTP-Foreign/   .*/Net-SFTP-Foreign-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) debian debian/repack.sh