[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-41-g917e329

David Prévot taffit at debian.org
Sun Mar 24 18:18:20 UTC 2013


The following commit has been merged in the master branch:
commit 84f068c93ef052151d6e86a7cea3aac39956fd67
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 24 11:34:58 2013 -0400

    Warning fix: don’t ship empty directories

diff --git a/debian/repack.sh b/debian/repack.sh
index 9f20122..0543699 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -32,7 +32,7 @@ rm -vfr $UP_BASE/3rdparty/timepicker/css/include
 rm -vfr $UP_BASE/core/js/jquery-1.7.2.min.js
 rm -vfr $UP_BASE/core/js/jquery-ui-1.10.0.custom.js
 # following contain incompatible license with Debian
-rm -vfr $UP_BASE/3rdparty/Console/Getopt.php
+rm -vfr $UP_BASE/3rdparty/Console
 rm -vfr $UP_BASE/3rdparty/Crypt_Blowfish
 rm -vfr $UP_BASE/3rdparty/fontawesome/docs
 rm -vfr $UP_BASE/apps/files_pdfviewer/3rdparty/pdfjs/compressed.tracemonkey-pldi-09.pdf
diff --git a/debian/rules b/debian/rules
index 48dd44f..74af1af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ override_dh_install:
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c
 	rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
-	rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/mediaelement/src
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/mediaelement
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
 	rm debian/owncloud/usr/share/owncloud/l10n/init.sh
 

-- 
owncloud.git



More information about the Pkg-owncloud-commits mailing list