[Pkg-owncloud-commits] [owncloud] 12/13: Use uglifyjs instead of yui-compressor

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f11cd73c02e011c598b3ffef4417f76659cbc43d
Author: David Prévot <taffit at debian.org>
Date:   Thu Aug 22 12:37:48 2013 +0200

    Use uglifyjs instead of yui-compressor
---
 debian/control |    2 +-
 debian/rules   |   25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index b458869..e625594 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alio
 Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
            David Prévot <taffit at debian.org>,
            Paul van Tilburg <paulvt at debian.org>
-Build-Depends: debhelper (>= 8.0.0), yui-compressor
+Build-Depends: debhelper (>= 8.0.0), node-uglify
 Standards-Version: 3.9.4
 Homepage: http://owncloud.org
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/owncloud.git
diff --git a/debian/rules b/debian/rules
index 67df2ac..ea3e7f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,14 +67,25 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js
 	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/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/contacts/js/jquery.Jcrop.js -o debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.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 >> \
+	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.min.js \
+		debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/js/fullcalendar.js
+	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js \
+		debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.js
+	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js \
+		debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.onfontresize.js \
+		&& uglifyjs \
+		debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.js \
+		>> \
 		debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.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
-	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
+	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf.js \
+		debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js
+	uglifyjs -o \
+		debian/owncloud/usr/share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js \
+		debian/owncloud/usr/share/owncloud/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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git