[Pkg-owncloud-commits] [owncloud] 159/172: Use Files-Excluded feature instead of homemade repack

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 1ef9f4971f53386dd35aef68fe9f511f933f6e54
Author: David Prévot <taffit at debian.org>
Date:   Sat May 17 11:31:26 2014 -0400

    Use Files-Excluded feature instead of homemade repack
---
 debian/copyright | 17 ++++++++++++++++
 debian/repack.sh | 62 --------------------------------------------------------
 debian/watch     |  3 +--
 3 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 68260c4..b3cd82a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,23 @@ Upstream-Name: owncloud
 Upstream-Contact: ownCloud mailinglist <owncloud at kde.org>
 Source: https://github.com/owncloud/core
         https://github.com/owncloud/
+Files-Excluded: 3rdparty/Console
+                3rdparty/sabre/dav/docs
+                3rdparty/timepicker/css/include
+                apps/documents/css/fonts/*.ttf
+                apps/documents/css/fonts/wqy-microhei.ttc
+                apps/files_encryption/3rdparty/Crypt_Blowfish
+                apps/files_texteditor/js/vendor/ace/src-noconflict/worker-*
+                apps/files_videoviewer/js/flashmediaelement.swf
+                apps/files_videoviewer/js/silverlightmediaelement.xap
+                core/doc/admin/_images/10000000000004CA000002B52116BE0C.png
+                core/doc/admin/_images/100000000000044C000002B0B421E27E.png
+                core/doc/*/_static/bootstrap.css
+                core/doc/*/_static/bootstrap.js
+                core/doc/*/_static/bootstrap-responsive.css
+                core/doc/*/_static/jquery.js
+                core/doc/*/_static/underscore.js
+                core/doc/*/searchindex.js
 
 Files: *
 Copyright: 2010, 2012-2014, Frank Karlitschek <frank at owncloud.org>
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index fcd3681..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,62 +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 xjf "$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 sourceless minified JavaScript, CSS, fonts, Flash, and Silverlight
-rm -vr $UP_BASE/3rdparty/timepicker/css/include
-rm -v  $UP_BASE/apps/documents/css/fonts/*.ttf
-rm -v  $UP_BASE/apps/documents/css/fonts/wqy-microhei.ttc
-rm -v  $UP_BASE/apps/files_videoviewer/js/flashmediaelement.swf
-rm -v  $UP_BASE/apps/files_videoviewer/js/silverlightmediaelement.xap
-rm -v  $UP_BASE/core/doc/*/_static/bootstrap.css
-rm -v  $UP_BASE/core/doc/*/_static/bootstrap.js
-rm -v  $UP_BASE/core/doc/*/_static/bootstrap-responsive.css
-rm -v  $UP_BASE/core/doc/*/_static/jquery.js
-rm -v  $UP_BASE/core/doc/*/_static/underscore.js
-rm -v  $UP_BASE/core/doc/*/searchindex.js
-
-# following contain incompatible license with Debian
-rm -vr $UP_BASE/3rdparty/Console
-rm -vr $UP_BASE/3rdparty/sabre/dav/docs
-rm -vr $UP_BASE/apps/files_encryption/3rdparty/Crypt_Blowfish
-rm -v  $UP_BASE/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-*
-rm -v  $UP_BASE/core/doc/admin/_images/10000000000004CA000002B52116BE0C.png
-rm -v  $UP_BASE/core/doc/admin/_images/100000000000044C000002B0B421E27E.png
-## 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/watch b/debian/watch
index 52fab85..60b2f30 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
 options=dversionmangle=s/\+dfsg[0-9]*//,uversionmangle=s/(\d)([a-z])$/$1.$2/,pgpsigurlmangle=s/$/.asc/ \
   http://owncloud.org/changelog/ \
-  http://download.owncloud.org/community/owncloud-(.*)\.tar\.bz2 \
-  debian sh debian/repack.sh
+  http://download.owncloud.org/community/owncloud-(.*)\.tar\.bz2

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