[Pkg-owncloud-commits] [php-sabredav] 02/22: Use Files-Excluded feature of uscan

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 1.8
in repository php-sabredav.

commit 40b7daaa1d60c309134241d061f6e3fa0c8ef9a8
Author: David Prévot <taffit at debian.org>
Date:   Sat Jan 18 15:15:29 2014 -0400

    Use Files-Excluded feature of uscan
---
 debian/copyright |  1 +
 debian/repack.sh | 44 --------------------------------------------
 debian/rules     |  2 +-
 debian/watch     |  3 +--
 4 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fc70e63..2a736f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sabredav
 Source: http://code.google.com/p/sabredav/
 Upstream-Contact: SabreDAV mailinglist <sabredav-discuss at googlegroups.com>
+Files-Excluded: docs
 
 Files: *
 Copyright: 2007-2013 fruux GmbH (https://fruux.com/)
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index 05df395..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# 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+dfsg"
-FILE="$3"
-PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-
-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"
-unzip "$FILE" -d "$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 non-DFSG compliant RFCs
-rm -vr $UP_BASE/docs
-## End
-
-mv "$UP_BASE" "$DIR/$REPACK_DIR"
-
-# Using a pipe hides tar errors!
-tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
-xz < "$DIR/repacked.tar" > "$DIR/repacked.tar.xz"
-RESULTING_FILE="$(dirname $FILE)/${PKG}_${VER}.orig.tar.xz"
-mv "$DIR/repacked.tar.xz" "$RESULTING_FILE"
-rm -f "$FILE"
-
-echo "*** $FILE repackaged"
-echo "*** Please note that the upstream version must be $VER since we are repackaging the tarball!"
diff --git a/debian/rules b/debian/rules
index c63d1d9..d224fbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,4 @@
 override_dh_auto_clean override_dh_auto_build:
 
 get-orig-source:
-	uscan --verbose --force
+	uscan --verbose --force --repack
diff --git a/debian/watch b/debian/watch
index 19f04d0..de02502 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
 options="dversionmangle=s/\+dfsg[0-9]*//,uversionmangle=s/alpha/~alpha/;s/beta/~beta/" \
   http://code.google.com/p/sabredav/downloads/list \
-  //sabredav.googlecode.com/files/SabreDAV-(.*).zip \
-  debian sh debian/repack.sh
+  //sabredav.googlecode.com/files/SabreDAV-(.*).zip

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git