[Pkg-owncloud-commits] [owncloud-client] 01/01: Used Files-Exclude feature instead of repack script.

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 947e347b3b5dadfe8b15782b5ca0018fab3a4bd6
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun Mar 23 23:10:58 2014 +0100

    Used Files-Exclude feature instead of repack script.
---
 debian/copyright |  2 ++
 debian/repack.sh | 44 --------------------------------------------
 debian/watch     |  3 +--
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 35436a0..d7ac881 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mirall
 Upstream-Contact: Klaas Freitag <freitag at owncloud.com>
 Source: http://owncloud.org/sync-clients/
+Files-Excluded:
+    admin
 
 Files: *
 Copyright: 2014, Daniel Molkentin <danimo at owncloud.com>
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index 58498bd..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"
-tar xaf "$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 nonfree stuff (only needed for windwos and mac builds)
-rm -vfr $UP_BASE/admin
-## End
-
-mv "$UP_BASE" "$DIR/$REPACK_DIR"
-
-# Using a pipe hides tar errors!
-tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
-bzip2 -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.bz2"
-RESULTING_FILE="$(dirname $FILE)/${PKG}_${VER}.orig.tar.bz2"
-mv "$DIR/repacked.tar.bz2" "$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/watch b/debian/watch
index 46ce515..30820bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,5 +6,4 @@
 version=3
 
 options="dversionmangle=s/\+dfsg[0-9]*//,uversionmangle=s/beta/~beta/;s/alpha/~alpha/,pgpsigurlmangle=s/$/.asc/" \
-https://owncloud.org/sync-clients/ https://download.owncloud.com/desktop/stable/mirall-(.*)\.tar\.bz2 \
-debian sh debian/repack.sh
+https://owncloud.org/sync-clients/ https://download.owncloud.com/desktop/stable/mirall-(.*)\.tar\.bz2

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