[Pkg-owncloud-commits] [owncloud] 11/13: Depend on libjs-jquery-fancybox

[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 7c73b253597468789dc0ac3e90ad8cd16709ebfa
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 20 18:25:04 2013 +0200

    Depend on libjs-jquery-fancybox
---
 debian/control                   |    1 +
 debian/owncloud.links            |    3 +++
 debian/owncloud.postinst         |    6 ++++++
 debian/patches/fix_fancybox.diff |   14 ++++++++++++++
 debian/patches/series            |    1 +
 debian/rules                     |    4 ++--
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 31923f3..b458869 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Depends: apache2 | httpd,
          fonts-font-awesome,
          libjs-chosen,
          libjs-jquery (>= 1.7.2-1),
+         libjs-jquery-fancybox,
          libjs-jquery-jplayer,
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 11c8fcf..47d3c27 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -14,6 +14,9 @@ usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.7.
 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
 usr/share/javascript/jquery-jplayer/add-on usr/share/owncloud/apps/media/js/add-on
+usr/share/javascript/jquery-fancybox				usr/share/owncloud/apps/files_imageviewer/css
+usr/share/javascript/jquery-fancybox/jquery.fancybox.js		usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+usr/share/javascript/jquery-fancybox/jquery.fancybox.min.js	usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js	usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
 usr/share/javascript/jquery-mousewheel/jquery.mousewheel.js	usr/share/owncloud/apps/gallery/js/jquery.mousewheel-3.1.1.js
 usr/share/javascript/jquery-mousewheel/jquery.mousewheel.min.js	usr/share/owncloud/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
diff --git a/debian/owncloud.postinst b/debian/owncloud.postinst
index 65e55fa..0e10249 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -84,6 +84,12 @@ case "$1" in
 			fi
 		fi
 	done
+	dir="/usr/share/owncloud/apps/files_imageviewer/css"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf ../../../javascript/jquery-fancybox $dir
+		fi
+	fi
 
     ;;
 
diff --git a/debian/patches/fix_fancybox.diff b/debian/patches/fix_fancybox.diff
new file mode 100644
index 0000000..0250166
--- /dev/null
+++ b/debian/patches/fix_fancybox.diff
@@ -0,0 +1,14 @@
+Description: Adapt FancyBox path
+ The Debian package depends on the packaged JavaScript library instead
+ of embedding it.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-08-31
+--- a/apps/files_imageviewer/appinfo/app.php
++++ b/apps/files_imageviewer/appinfo/app.php
+@@ -3,4 +3,4 @@
+ OCP\Util::addscript( 'files_imageviewer', 'lightbox' );
+ OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
+ OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
+-OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
++OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox' );
diff --git a/debian/patches/series b/debian/patches/series
index d4512c5..9fa33aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix_crypt_blowfish.diff
 fix_log_path.diff
 fix_symphony.diff
 fix_chosen.diff
+fix_fancybox.diff
diff --git a/debian/rules b/debian/rules
index 520b871..67df2ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,6 @@ override_dh_install:
 	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
-	rm debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 	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
 
@@ -74,7 +73,6 @@ override_dh_install:
 		-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
-	yui-compressor --type js debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js -o debian/owncloud/usr/share/owncloud/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.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
 
@@ -96,6 +94,8 @@ override_dh_install:
 	# Remove third party provided by external package
 	rmdir debian/owncloud/usr/share/owncloud/apps/files_encryption/3rdparty
 	rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/phpseclib
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_imageviewer/css
+	rm -r debian/owncloud/usr/share/owncloud/apps/files_imageviewer/img
 
 	# Fix displayed version
 	sed -i "s/@VERSION@/$(VERSION) (Debian)/" \

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