[Pkg-owncloud-commits] [owncloud] 01/15: Simplify fonts-font-awesome handling

[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 2c249b95c037360f7596e56ea5c7a16818452904
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 13 17:17:50 2013 -0400

    Simplify fonts-font-awesome handling
---
 debian/control           |    2 +-
 debian/owncloud.links    |    7 +------
 debian/owncloud.postinst |    4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 217a2ea..575cc65 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 (>= 3.2.1~dfsg-1~),
+         fonts-font-awesome (>= 3.2.1~dfsg-2~),
          libjs-chosen,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-fancybox,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index 86feef1..fcda17b 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -31,12 +31,7 @@ usr/share/javascript/pdf/pdf.js			usr/share/owncloud/apps/files_pdfviewer/3rdpar
 usr/share/javascript/pdf/viewer.css		usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/viewer.css
 
 # Use fonts from font-awesome
-usr/share/fonts/eot/font-awesome/fontawesome-webfont.eot	usr/share/owncloud/3rdparty/fontawesome/font/fontawesome-webfont.eot
-usr/share/fonts/opentype/font-awesome/FontAwesome.otf		usr/share/owncloud/3rdparty/fontawesome/font/FontAwesome.otf
-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
+usr/share/fonts-font-awesome						usr/share/owncloud/3rdparty/fontawesome
 
 # 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 7488624..15171f2 100644
--- a/debian/owncloud.postinst
+++ b/debian/owncloud.postinst
@@ -90,10 +90,10 @@ case "$1" in
 			ln -sf ../../../javascript/jquery-fancybox $dir
 		fi
 	fi
-	dir="/usr/share/owncloud/3rdparty/fontawesome/css"
+	dir="/usr/share/owncloud/3rdparty/fontawesome"
 	if [ -d $dir ] && [ ! -L $dir ]; then
 		if rmdir $dir 2>/dev/null; then
-			ln -sf ../../../fonts-font-awesome/css $dir
+			ln -sf ../../../fonts-font-awesome $dir
 		fi
 	fi
 

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