[Pkg-owncloud-commits] [owncloud] 66/83: Adapt packaging to removed files_imageviewer

David Prévot taffit at moszumanska.debian.org
Wed Dec 18 13:05:32 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 2a636643130f059e55ea5171cc069484815d06e2
Author: David Prévot <taffit at debian.org>
Date:   Sat Dec 14 15:18:07 2013 -0400

    Adapt packaging to removed files_imageviewer
---
 debian/control           | 1 -
 debian/copyright         | 9 ---------
 debian/owncloud.links    | 5 -----
 debian/owncloud.postinst | 6 ------
 debian/rules             | 2 --
 5 files changed, 23 deletions(-)

diff --git a/debian/control b/debian/control
index b1dd0a6..ef975d2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Depends: apache2 | httpd,
          libjs-chosen,
          libjs-jcrop,
          libjs-jquery (>= 1.7.2-1),
-         libjs-jquery-fancybox,
          libjs-jquery-jplayer,
          libjs-jquery-minicolors (<< 2~),
          libjs-jquery-mousewheel,
diff --git a/debian/copyright b/debian/copyright
index 5dc99b7..cb08066 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -469,15 +469,6 @@ Files: apps/files_external/3rdparty/phpseclib/*
 Copyright: 2006-2012, Jim Wigginton <terrafrost at php.net>
 License: Expat
 
-Files: apps/files_imageviewer/js/jquery.fancybox-1.3.4*js
-Copyright: 2008-2010, Janis Skarnelis
-License: Expat or GPL-2
-
-Files: apps/files_imageviewer/js/jquery.mousewheel-3.0.4*.js
-       apps/gallery/js/jquery.mousewheel-3.1.1.js
-Copyright: 2010, 2013, Brandon Aaron
-License: Expat
-
 Files: apps/files_odfviewer/css/webodf.css
        apps/files_odfviewer/js/webodf*.js
        apps/files_odfviewer/src/webodf/*
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 7602c61..51900af 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -16,12 +16,7 @@ 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
 usr/share/php/Zend usr/share/owncloud/apps/search_lucene/3rdparty/Zend
 
 # pdf.js is mostly taken from the external package
diff --git a/debian/owncloud.postinst b/debian/owncloud.postinst
index d9be046..ecc7312 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -84,12 +84,6 @@ 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
 	dir="/usr/share/owncloud/3rdparty/fontawesome"
 	if [ -d $dir ] && [ ! -L $dir ]; then
 		if rmdir $dir 2>/dev/null; then
diff --git a/debian/rules b/debian/rules
index cad9904..39ad46e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,8 +90,6 @@ 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
-	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



More information about the Pkg-owncloud-commits mailing list