This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit dd6e6bf9a68466c0d7445ac9a560f4259301f9cc
Author: David Prévot <taffit at debian.org>
Date: Thu Aug 8 09:18:49 2013 +0200
Depend on libjs-chosen
---
debian/control | 1 +
debian/owncloud.install | 1 -
debian/owncloud.links | 1 +
debian/owncloud.postinst | 6 ++++++
debian/rules | 7 -------
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/control b/debian/control
index dcdda1c..c48c8f5 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Package: owncloud
Architecture: all
Depends: apache2 | httpd,
fonts-font-awesome,
+ libjs-chosen,
libjs-jquery (>= 1.7.2-1),
libjs-jquery-jplayer,
libjs-jquery-minicolors (<< 2~),
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 8e9018a..f6a89a4 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -16,7 +16,6 @@ themes/* /var/lib/owncloud/themes
3rdparty/css /usr/share/owncloud/3rdparty
3rdparty/fontawesome /usr/share/owncloud/3rdparty
3rdparty/fullcalendar /usr/share/owncloud/3rdparty
-3rdparty/js /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 7f5b3ef..7d1f65a 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -8,6 +8,7 @@ etc/owncloud usr/share/owncloud/config
etc/owncloud/htaccess usr/share/owncloud/.htaccess
# Link JavaScript files from the locations in dependency packages.
+usr/share/javascript/chosen usr/share/owncloud/3rdparty/js/chosen
usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.7.2.min.js
usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js/Jplayer.swf
usr/share/javascript/jquery-jplayer/jquery.jplayer.min.js usr/share/owncloud/apps/media/js/jquery.jplayer.min.js
diff --git a/debian/owncloud.postinst b/debian/owncloud.postinst
index a340677..84a8d6c 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -76,6 +76,12 @@ case "$1" in
fi
fi
done
+ dir="/usr/share/owncloud/3rdparty/js/chosen"
+ if [ -d $dir ] && [ ! -L $dir ]; then
+ if rmdir $dir 2>/dev/null; then
+ ln -sf ../../../javascript/chosen $dir
+ fi
+ fi
;;
diff --git a/debian/rules b/debian/rules
index 11582f9..6c14c64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ override_dh_install:
# Remove redundant license files as it is already captured in debian/copyright.
rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/LICENSE.txt
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/php-cloudfiles/COPYING
rm debian/owncloud/usr/share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE
@@ -30,8 +29,6 @@ override_dh_install:
# Remove other useless documentation
rm debian/owncloud/usr/share/owncloud/3rdparty/Dropbox/README.md
rm debian/owncloud/usr/share/owncloud/3rdparty/fontawesome/README.md
- rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md
- rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/VERSION
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/AUTHORS
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README
@@ -59,8 +56,6 @@ override_dh_install:
rm -r debian/owncloud/usr/share/owncloud/l10n
# Minify JavaScript files.
- 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/apps/contacts/js/jquery.Jcrop.min.js
rm debian/owncloud/usr/share/owncloud/apps/contacts/js/placeholder_polyfill.jquery.min.combo.js
@@ -69,8 +64,6 @@ 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/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/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 \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git