[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-69-g9bd3395

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 9bd339520a3e48af49367e99623e86008ed898a9
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu May 17 00:51:32 2012 +0200

    Some reordering

diff --git a/debian/rules b/debian/rules
index c49c6f1..a1ea61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR-LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
+	rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
 	rm debian/owncloud/usr/share/owncloud/3rdparty/simpletest/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
@@ -41,57 +42,56 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/LICENSE.jquery.inview
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
-	rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
 	# Remove other stuff
+	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
+	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
+	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
+	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
+	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
 	rm debian/owncloud/usr/share/owncloud/core/img/filetypes/readme*.txt
 	rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/src
-	rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
 	rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_archive/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/tests
+	rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
 	
 	# Remove an unused scripts, source and minified JavaScript files.
-	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
-	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
+	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/3rdparty/simpletest
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
+	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.inview.txt
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.7.2.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl # not really of any use
-	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
-	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
-	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c
-	rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php
-	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.inview.txt
 
-	# Minify JavaScript files.
+	# Minify JavaScript files and remove the source.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
-	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
-	yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js -o debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js -o debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
+	yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js
 
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
-	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
+	rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js
 
 	# Minify ace in app_texteditor
 	find debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor -type f | grep -v 'ace-uncompressed' | xargs -exec rm

-- 
owncloud.git