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

[Thomas Mueller]

The following commit has been merged in the master branch:
commit eababad78012cd7b192ddbdf9925d804929fdb0b
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sat May 12 00:53:56 2012 +0200

    minify 3rdparty/fullcalendar/js/fullcalendar.js
    remove un-minified version of: fullcalendar, chosen and jquery.infieldlabel

diff --git a/debian/TODO b/debian/TODO
index 3a677ab..a75b194 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -15,8 +15,6 @@
 * write patch to prefent installation of 3rd party apps via the internet, 
   because this is risky. Bad code can be injected.
 * remove 3rdparty/fullcalendar/changelog.txt
-* minify 3rdparty/fullcalendar/js/fullcalendar.min.js
-* choosen remove un-minified version
 * 3rdparty/timepicker/css/include/ contains jquery lib - analyse it and removeAllListeners
 * remove 3rdparty/timepicker/releases.txt
 * apps/contacts/js/jquery.inview.txt - copyright and remove
diff --git a/debian/rules b/debian/rules
index 49b43f5..1edcb62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,11 +45,14 @@ override_dh_install:
 	# 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
 	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
-	#
-	# TODO: remove source after minified
-	#
+	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
+	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/3rdparty/fullcalendar/changelog.txt
 
 	# 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