[Pkg-owncloud-commits] [owncloud] 09/13: Complete libjs-chosen move

[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 0c45672144be9f0f310158d7172b0b620694b661
Author: David Prévot <taffit at debian.org>
Date:   Sat Aug 31 16:25:35 2013 -0400

    Complete libjs-chosen move
    
    Git-Dch: Ignore
---
 debian/owncloud.install        |    1 -
 debian/owncloud.links          |    1 +
 debian/owncloud.postinst       |   12 +++++++-----
 debian/patches/fix_chosen.diff |   16 ++++++++++++++++
 debian/patches/series          |    1 +
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/owncloud.install b/debian/owncloud.install
index f1a4476..592dbd0 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -14,7 +14,6 @@ themes/* /var/lib/owncloud/themes
 3rdparty/Dropbox	/usr/share/owncloud/3rdparty
 3rdparty/Google		/usr/share/owncloud/3rdparty
 3rdparty/Patchwork	/usr/share/owncloud/3rdparty
-3rdparty/css /usr/share/owncloud/3rdparty
 3rdparty/fontawesome	/usr/share/owncloud/3rdparty
 3rdparty/fullcalendar /usr/share/owncloud/3rdparty
 3rdparty/openid		/usr/share/owncloud/3rdparty
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 7d1f65a..cad1828 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -9,6 +9,7 @@ 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/chosen		usr/share/owncloud/3rdparty/css/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 84a8d6c..65e55fa 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -76,12 +76,14 @@ 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
+	subdir="/usr/share/owncloud/3rdparty/"
+	for dir in ${subdir}css/chosen ${subdir}js/chosen; do
+		if [ -d $dir ] && [ ! -L $dir ]; then
+			if rmdir $dir 2>/dev/null; then
+				ln -sf ../../../javascript/chosen $dir
+			fi
 		fi
-	fi
+	done
 
     ;;
 
diff --git a/debian/patches/fix_chosen.diff b/debian/patches/fix_chosen.diff
new file mode 100644
index 0000000..7c9cc15
--- /dev/null
+++ b/debian/patches/fix_chosen.diff
@@ -0,0 +1,16 @@
+Description: Adapt chosen css path
+ Avoid shipping duplicate files in subdirectories.
+Author: David Prévot <taffit at debian.org>
+Forwarded: no
+Last-Update: 2013-08-31
+--- a/settings/personal.php
++++ b/settings/personal.php
+@@ -14,7 +14,7 @@
+ OC_Util::addScript( 'settings', 'personal' );
+ OC_Util::addStyle( 'settings', 'settings' );
+ OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+-OC_Util::addStyle( '3rdparty', 'chosen' );
++OC_Util::addStyle( '3rdparty', 'chosen/chosen' );
+ OC_App::setActiveNavigationEntry( 'personal' );
+ 
+ $storageInfo=OC_Helper::getStorageInfo();
diff --git a/debian/patches/series b/debian/patches/series
index 5f9f547..d4512c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_aws-sdk.diff
 fix_crypt_blowfish.diff
 fix_log_path.diff
 fix_symphony.diff
+fix_chosen.diff

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