[Pkg-owncloud-commits] [owncloud] 01/01: Use CSS provided by the latest fonts-font-awesome

[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 461cbe2286e9be39fbe784aeadc16904ec110b6f
Author: David Prévot <taffit at debian.org>
Date:   Thu Sep 26 22:38:36 2013 -0400

    Use CSS provided by the latest fonts-font-awesome
---
 debian/control           |    2 +-
 debian/owncloud.install  |    1 -
 debian/owncloud.links    |    1 +
 debian/owncloud.postinst |    6 ++++++
 debian/rules             |    1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 90e07dd..8e70ae0 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
 Package: owncloud
 Architecture: all
 Depends: apache2 | httpd,
-         fonts-font-awesome,
+         fonts-font-awesome (>= 3.2.1~dfsg-1~),
          libjs-chosen,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-fancybox,
diff --git a/debian/owncloud.install b/debian/owncloud.install
index 590f3bc..278885d 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -13,7 +13,6 @@ themes/* /var/lib/owncloud/themes
 # Third party stuff.
 3rdparty/Dropbox	/usr/share/owncloud/3rdparty
 3rdparty/Google		/usr/share/owncloud/3rdparty
-3rdparty/fontawesome	/usr/share/owncloud/3rdparty
 3rdparty/fullcalendar /usr/share/owncloud/3rdparty
 3rdparty/openid		/usr/share/owncloud/3rdparty
 3rdparty/php-cloudfiles /usr/share/owncloud/3rdparty
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 47d3c27..a53324c 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -37,6 +37,7 @@ 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
+usr/share/fonts-font-awesome/css				usr/share/owncloud/3rdparty/fontawesome/css
 
 # Use jQuery MiniColors from libjs-jquery-minicolors
 /usr/share/javascript/jquery-minicolors					usr/share/owncloud/3rdparty/miniColors/css
diff --git a/debian/owncloud.postinst b/debian/owncloud.postinst
index 0e10249..7488624 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -90,6 +90,12 @@ case "$1" in
 			ln -sf ../../../javascript/jquery-fancybox $dir
 		fi
 	fi
+	dir="/usr/share/owncloud/3rdparty/fontawesome/css"
+	if [ -d $dir ] && [ ! -L $dir ]; then
+		if rmdir $dir 2>/dev/null; then
+			ln -sf ../../../fonts-font-awesome/css $dir
+		fi
+	fi
 
     ;;
 
diff --git a/debian/rules b/debian/rules
index fb6d33c..bc03fb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,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/php-cloudfiles/AUTHORS
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/Changelog
 	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/README

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