[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.7+dfsg-2-9-g54d90c5

[David Prévot]

The following commit has been merged in the master branch:
commit 54d90c5509585bbb00fbcb2de85419e7b75f1627
Author: David Prévot <taffit at debian.org>
Date:   Tue Jul 2 11:28:08 2013 -0400

    Depend on libjs-jquery-minicolors

diff --git a/debian/control b/debian/control
index 7a18d72..328147d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Depends: apache2 | httpd,
          fonts-font-awesome,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
+         libjs-jquery-minicolors,
          libjs-jquery-timepicker,
          libjs-jquery-ui,
          libjs-pdf,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 83ec491..8e9018a 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -17,7 +17,6 @@ themes/* /var/lib/owncloud/themes
 3rdparty/fontawesome	/usr/share/owncloud/3rdparty
 3rdparty/fullcalendar /usr/share/owncloud/3rdparty
 3rdparty/js /usr/share/owncloud/3rdparty
-3rdparty/miniColors	/usr/share/owncloud/3rdparty
 3rdparty/openid		/usr/share/owncloud/3rdparty
 3rdparty/php-cloudfiles /usr/share/owncloud/3rdparty
 3rdparty/phpass /usr/share/owncloud/3rdparty
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 89ebea0..7f5b3ef 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -30,6 +30,10 @@ usr/share/fonts/svg/font-awesome/fontawesome-webfont.svg	usr/share/owncloud/3rdp
 usr/share/fonts/truetype/font-awesome/fontawesome-webfont.ttf	usr/share/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.ttf
 usr/share/fonts/woff/font-awesome/fontawesome-webfont.woff	usr/share/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.woff
 
+# Use jQuery MiniColors from libjs-jquery-minicolors
+/usr/share/javascript/jquery-minicolors					usr/share/owncloud/3rdparty/miniColors/css
+/usr/share/javascript/jquery-minicolors					usr/share/owncloud/3rdparty/miniColors/js
+
 # Use jQuery timepicker from libjs-jquery-timepicker
 usr/share/javascript/jquery-timepicker/jquery-ui-sliderAccess.js	usr/share/owncloud/3rdparty/timepicker/js/jquery-ui-sliderAccess.js
 usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.css	usr/share/owncloud/3rdparty/timepicker/css/jquery.ui.timepicker.css
diff --git a/debian/owncloud.postinst b/debian/owncloud.postinst
index 6f62026..69c2fff 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -61,6 +61,15 @@ case "$1" in
 			ln -sf ../../../../../javascript/pdf/locale $dir
 		fi
 	fi
+	subdir="/usr/share/owncloud/3rdparty/miniColors/"
+	for dir in ${subdir}css ${subdir}js; do
+		if [ -d $dir ] && [ ! -L $dir ]; then
+			if rmdir $dir 2>/dev/null; then
+				ln -sf ../../../javascript/jquery-minicolors $dir
+			fi
+		fi
+	done
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 205e058..86503ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/Google/LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
-	rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
 	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
@@ -63,7 +62,6 @@ override_dh_install:
 	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
-	rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.Jcrop.min.js
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
 	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
@@ -74,7 +72,6 @@ override_dh_install:
 	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/3rdparty/js/chosen/chosen.proto.js -o debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/chosen.proto.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/3rdparty/miniColors/js/jquery.miniColors.js -o debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.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 && \

-- 
owncloud.git