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

[David Prévot]

The following commit has been merged in the master branch:
commit bf27d2faa4dd12d3a96218df72971eefc76ef75e
Author: David Prévot <taffit at debian.org>
Date:   Tue Mar 26 23:59:31 2013 -0400

    Keep non-minified JavaScript
    
    They can be useful for debugging, or even needed (e.g.
    contacts/js/jquery.Jcrop or 3rdparty/fullcalendar/js/fullcalendar).

diff --git a/debian/changelog b/debian/changelog
index ddc4dab..1149e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
   * debian/copyright: Document the new and updated licenses
   * debian/rules:
     - Trim duplicated and useless files from the package
-    - Minify JavaScript
+    - Minify JavaScript and keep their source
   * debian/repack.sh:
     - Remove incompatible docs from Font Awesome
     - Remove incompatible PDF from pdfjs
diff --git a/debian/rules b/debian/rules
index d072b5a..631a90e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
 	rm debian/owncloud/usr/share/owncloud/l10n/init.sh
 
-	# Minify JavaScript files and remove the source.
+	# Minify JavaScript files.
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.min.js
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js
@@ -77,28 +77,18 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.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
-	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.jquery.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.min.js
-	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.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
-	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js -o debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
-	rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.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
-	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
 	yui-compressor --type js apps/contacts/js/jquery.onfontresize.js \
 		-o debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js && \
 		yui-compressor --type js apps/contacts/js/placeholder_polyfill.jquery.js >> \
 		debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
-	rm apps/contacts/js/jquery.onfontresize.js apps/contacts/js/placeholder_polyfill.jquery.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
-	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.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/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
 	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js -o debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
-	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
 	yui-compressor --type js apps/files_videoviewer/js/mediaelement-and-player.js -o debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js
-	rm apps/files_videoviewer/js/mediaelement-and-player.js
 
 	# Move the MDB2 Sqlite driver to owncloud-sqlite.
 	mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)

-- 
owncloud.git