[Pkg-apache-commits] r861 - in /branches/experimental-apr-util: README.source changelog repack.sh watch

[ryan52-guest at alioth.debian.org]

Author: ryan52-guest
Date: Fri Dec 26 21:35:19 2008
New Revision: 861

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=861
Log:
add repack.sh

Added:
    branches/experimental-apr-util/repack.sh
Modified:
    branches/experimental-apr-util/README.source
    branches/experimental-apr-util/changelog
    branches/experimental-apr-util/watch

Modified: branches/experimental-apr-util/README.source
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/README.source?rev=861&op=diff
==============================================================================
--- branches/experimental-apr-util/README.source (original)
+++ branches/experimental-apr-util/README.source Fri Dec 26 21:35:19 2008
@@ -17,3 +17,4 @@
 To make a patch not get used remove it from debian/patches/00list .
 
 Upstream tarballs need to be repackaged without crypto/apr_md4.c, crypto/apr_md5.c, include/apr_md4.h, and include/apr_md5.h because of their license.
+These are removed by debian/repack.sh, which is called from uscan.

Modified: branches/experimental-apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/changelog?rev=861&op=diff
==============================================================================
--- branches/experimental-apr-util/changelog (original)
+++ branches/experimental-apr-util/changelog Fri Dec 26 21:35:19 2008
@@ -6,7 +6,10 @@
   [ Stefan Fritsch ]
   * Fix decription for libaprutil1-dbg (closes: #508145).
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 29 Nov 2008 17:05:43 -0800
+  [ Ryan Niebur ]
+  * add repack.sh
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 26 Dec 2008 13:26:44 -0800
 
 apr-util (1.3.2+dfsg-1) experimental; urgency=low
 

Added: branches/experimental-apr-util/repack.sh
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/repack.sh?rev=861&op=file
==============================================================================
--- branches/experimental-apr-util/repack.sh (added)
+++ branches/experimental-apr-util/repack.sh Fri Dec 26 21:35:19 2008
@@ -1,0 +1,49 @@
+#!/bin/bash
+
+# "borrowed" from pkg-perl :)
+
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2"
+FILE="$3"
+PKG=$(dpkg-parsechangelog | awk -F": " '/^Source: /{print $2}')
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+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
+
+## Remove stuff
+rm -fvr $UP_BASE/{crypto,include}/{apr_md4.,apr_md5.}{c,h}
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"
+NEWFILE="$(echo "$FILE" | sed "s/$VER/&+dfsg/")"
+mv "$FILE" "$NEWFILE"
+echo
+echo "Renamed $FILE to $NEWFILE"

Modified: branches/experimental-apr-util/watch
URL: http://svn.debian.org/wsvn/pkg-apache/branches/experimental-apr-util/watch?rev=861&op=diff
==============================================================================
--- branches/experimental-apr-util/watch (original)
+++ branches/experimental-apr-util/watch Fri Dec 26 21:35:19 2008
@@ -1,2 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg$// http://www.apache.org/dist/apr/apr-util-(1\..\..*)\.tar\.gz
+opts=dversionmangle=s/\+dfsg$// http://www.apache.org/dist/apr/apr-util-(1\..\..*)\.tar\.gz \
+debian bash debian/repack.sh