[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/3.0.3-44-g470eb1b

[Thomas Mueller]

The following commit has been merged in the master branch:
commit 470eb1bda28e07ad7189c9a649e4ebcd7f027f33
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Mon May 14 00:46:34 2012 +0200

    further minifications and cleanups

diff --git a/debian/TODO b/debian/TODO
index bd9d76d..2d96d9a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,13 +1,5 @@
 * dbconfig integration
-* get non-minified version for:
-  - apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
-  - apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
-  [fixed upstream for OC4 - patch to OC3 will follow]
 * build pdf.js based on source contained and remove the source
-* files_texteditor: 
-  - minify js
-  - maybe own package?
-  - make sure the minified js files are used
 * respect copyright:
   - apps/user_openid/phpmyid.php - license known, but not the copyright!
 * ensure ReWrite is enabled  - used by webfinger
@@ -15,10 +7,8 @@
   but erroneously containing text about having the same license as SabreDAV
 * write patch to prefent installation of 3rd party apps via the internet, 
   because this is risky. Bad code can be injected.
-* 3rdparty/timepicker/css/include/ contains jquery lib - analyse it and removeAllListeners
 * apps/contacts/js/jquery.inview.txt - copyright and remove
 * apps/media/getID3/ - read all *.txt - respect copyright and dependencies
 * blame apps/remoteStorage/oauth_ro_auth.php - correct file header
   [done for UC4 - fixed upstream]
 
-
diff --git a/debian/rules b/debian/rules
index 7a01691..9d357fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,17 +45,26 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl # not really of any useScriptTags
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.6.4.min.js
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js
+	rm -rf debian/owncloud/usr/share/owncloud/3rdparty/timepicker/css/include
+	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
+	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
 
 	# Minify JavaScript files.
 	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
 	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
 	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
 
 	# 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