[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.6_rc1+dfsg-1-1-g33b240e

[David Prévot]

The following commit has been merged in the master branch:
commit 33b240e2f50fbac9194af3f8abce1d0d056420b5
Author: David Prévot <taffit at debian.org>
Date:   Thu May 9 18:15:58 2013 -0400

    Depend on libjs-jquery-timepicker
    
    Closes: #693887

diff --git a/debian/control b/debian/control
index 1767197..1e993e2 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends: apache2 | httpd,
          fonts-font-awesome,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
+         libjs-jquery-timepicker,
          libjs-jquery-ui,
          libjs-pdf,
          libphp-phpmailer,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 0063399..75346e8 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -22,7 +22,6 @@ themes/* /var/lib/owncloud/themes
 3rdparty/php-cloudfiles /usr/share/owncloud/3rdparty
 3rdparty/phpass /usr/share/owncloud/3rdparty
 3rdparty/symfony	/usr/share/owncloud/3rdparty
-3rdparty/timepicker /usr/share/owncloud/3rdparty
 
 # Files.
 db_structure.xml /usr/share/owncloud
diff --git a/debian/owncloud.links b/debian/owncloud.links
index a00db71..89ebea0 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -29,3 +29,9 @@ usr/share/fonts/opentype/font-awesome/FontAwesome.otf		usr/share/owncloud/3rdpar
 usr/share/fonts/svg/font-awesome/fontawesome-webfont.svg	usr/share/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.svg
 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 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
+usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.js	usr/share/owncloud/3rdparty/timepicker/js/jquery.ui.timepicker.js
+usr/share/javascript/jquery-timepicker/localization			usr/share/owncloud/3rdparty/timepicker/js/localization
diff --git a/debian/postinst b/debian/postinst
index 989be0d..bef455d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -63,6 +63,12 @@ case "$1" in
 			ln -sf ../../../../../javascript/pdf/locale $dir
 		fi
 	fi
+	dir="/usr/share/owncloud/3rdparty/timepicker/js/localization"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf ../../../../javascript/jquery-timepicker/localization $dir
+		fi
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/rules b/debian/rules
index 9c92427..9cd3f9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ override_dh_install:
 	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/3rdparty/timepicker/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/LICENSE
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/css/DroidSansMono/Google\ Android\ License.txt
 	rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE
@@ -38,7 +37,6 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
 	rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/README.md
-	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
 	rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
 	rm debian/owncloud/usr/share/owncloud/apps/files_antivirus/README.md
 	rm debian/owncloud/usr/share/owncloud/apps/updater/README

-- 
owncloud.git