[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.5_rc1+dfsg-1-13-g4bf08ce

[David Prévot]

The following commit has been merged in the master branch:
commit be5225168a16a7da4ca86ac6f35e4e3e42a8a4c2
Author: David Prévot <taffit at debian.org>
Date:   Mon May 6 17:47:29 2013 -0400

    Depend on fonts-font-awesome

diff --git a/debian/control b/debian/control
index 3527f14..1767197 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud.git
 Package: owncloud
 Architecture: all
 Depends: apache2 | httpd,
+         fonts-font-awesome,
          libjs-jquery (>= 1.7.2-1),
          libjs-jquery-jplayer,
          libjs-jquery-ui,
diff --git a/debian/owncloud.links b/debian/owncloud.links
index f1604af..a00db71 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -22,3 +22,10 @@ usr/share/javascript/pdf/l10n.js		usr/share/owncloud/apps/files_pdfviewer/3rdpar
 usr/share/javascript/pdf/locale			usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/locale
 usr/share/javascript/pdf/pdf.js			usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs/pdf.js
 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

-- 
owncloud.git