[Pkg-owncloud-commits] [owncloud] 01/01: Depend on libjs-jcrop

[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 3894941832ea85310e5e6448f45f9ae9a8ea3cd9
Author: David Prévot <taffit at debian.org>
Date:   Sun Nov 17 21:33:04 2013 -0400

    Depend on libjs-jcrop
---
 debian/control  |  6 ++----
 debian/install  |  1 -
 debian/links    |  1 +
 debian/postinst |  6 ++++++
 debian/rules    | 13 -------------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index c853c8b..1839c77 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +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: cleancss,
-               debhelper (>= 8.0.0),
-               libjs-dojo-dojox,
-               node-uglify
+Build-Depends: debhelper (>= 8), libjs-dojo-dojox, node-uglify
 Standards-Version: 3.9.5
 Homepage: http://owncloud.org
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/owncloud.git
@@ -20,6 +17,7 @@ Depends: apache2 | httpd,
          fonts-font-awesome,
          libjs-chosen,
          libjs-dojo-dojox,
+         libjs-jcrop,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
diff --git a/debian/install b/debian/install
index ea975ac..63c4d6b 100644
--- a/debian/install
+++ b/debian/install
@@ -9,7 +9,6 @@ settings	usr/share/owncloud
 themes		var/lib/owncloud
 
 # Third party
-3rdparty/Jcrop			usr/share/owncloud/3rdparty
 3rdparty/PHPExcel/Classes	usr/share/owncloud/3rdparty/PHPExcel
 3rdparty/Pimple			usr/share/owncloud/3rdparty
 3rdparty/doctrine/dbal/lib	usr/share/owncloud/3rdparty/doctrine/dbal
diff --git a/debian/links b/debian/links
index a692a16..9458d63 100644
--- a/debian/links
+++ b/debian/links
@@ -13,6 +13,7 @@ usr/share/javascript/chosen		usr/share/owncloud/3rdparty/css/chosen
 usr/share/javascript/dijit		usr/share/owncloud/apps/documents/js/3rdparty/resources/dijit
 usr/share/javascript/dojo		usr/share/owncloud/apps/documents/js/3rdparty/resources/dojo
 usr/share/javascript/dojox		usr/share/owncloud/apps/documents/js/3rdparty/resources/dojox
+usr/share/javascript/jcrop		usr/share/owncloud/3rdparty/Jcrop
 usr/share/javascript/jquery/jquery.min.js			usr/share/owncloud/core/js/jquery-1.10.0.min.js
 usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js	usr/share/owncloud/apps/gallery/js/jquery.mousewheel-3.1.1.js
 
diff --git a/debian/postinst b/debian/postinst
index ecc7312..7bc007d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -90,6 +90,12 @@ case "$1" in
 			ln -sf ../../fonts-font-awesome $dir
 		fi
 	fi
+	dir="/usr/share/owncloud/3rdparty/Jcrop"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf ../../javascript/jcrop $dir
+		fi
+	fi
 
     ;;
 
diff --git a/debian/rules b/debian/rules
index e4d080a..5126b4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_install:
 	dh_install
 
 	# Remove redundant license files as it is already captured in debian/copyright.
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/MIT-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/COPYING-README
@@ -24,7 +23,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
 	# Remove other useless documentation
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/README.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Chart/Renderer/PHP\ Charting\ Libraries.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
 	rm debian/owncloud/usr/share/owncloud/3rdparty/PHPExcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
@@ -63,7 +61,6 @@ override_dh_install:
 	rm    debian/owncloud/usr/share/owncloud/core/img/image-optimization.sh
 
 	# Minify JavaScript files.
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/activity/js/jquery.infinitescroll.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
@@ -74,9 +71,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js
 
 	uglifyjs -o \
-		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.min.js \
-		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/js/jquery.Jcrop.js
-	uglifyjs -o \
 		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.min.js \
 		debian/owncloud/usr/share/owncloud/apps/calendar/3rdparty/fullcalendar/js/fullcalendar.js
 	uglifyjs -o \
@@ -115,13 +109,6 @@ override_dh_install:
 		debian/owncloud/usr/share/owncloud/core/js/jquery-migrate-1.2.1.min.js \
 		debian/jquery-migrate-1.2.1.js
 
-	# Minify CSS files
-	rm debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/css/jquery.Jcrop.min.css
-
-	cleancss -o \
-		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/css/jquery.Jcrop.min.css \
-		debian/owncloud/usr/share/owncloud/3rdparty/Jcrop/css/jquery.Jcrop.css
-
 	# Clean up apps to link external third parties
 	rm -r debian/owncloud/usr/share/owncloud/apps/documents/js/3rdparty/resources
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/images

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