[Pkg-owncloud-commits] [owncloud] 02/02: Reverting the switch from yui-compressor to node-uglify, as it's not available in Wheezy (git commit: f11cd73c)

[Gunnar Wolf]

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

gwolf pushed a commit to branch bpo70
in repository owncloud.

commit 7e3e4be1e703a74a2acf0daaeae49741015070a5
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Fri Sep 27 13:13:00 2013 -0500

    Reverting the switch from yui-compressor to node-uglify, as it's not available in Wheezy (git commit: f11cd73c)
---
 debian/changelog |    6 ++++--
 debian/control   |    2 +-
 debian/rules     |   25 +++++++------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96986e7..cc90ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 owncloud (5.0.11+dfsg-1~bpo70+1) wheezy-backports; urgency=low
 
   * Targetting build to Backports
-  
+  * Reverting the switch from yui-compressor to node-uglify, as it's not
+    available in Wheezy (git commit: f11cd73c)
+
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 26 Sep 2013 12:54:35 -0500
-  
+
 owncloud (5.0.11+dfsg-1) unstable; urgency=low
 
   * Imported Upstream version 5.0.11+dfsg
diff --git a/debian/control b/debian/control
index cb605c3..52b4091 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), node-uglify
+Build-Depends: debhelper (>= 8.0.0), yui-compressor
 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 2c2e1bd..15a4265 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,25 +61,14 @@ 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
 
-	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 \
-		>> \
+	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 >> \
 		debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.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 
+	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
 
 	# 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