patches: Added 01-font-path.diff.

This patch lets 'fontpath' point to the DejaVu fonts in '/usr/share/fonts'.

Also, in rules, no longer symlink the DejaVu fonts path into Kohana's 'system'
directory.

diff --git a/debian/changelog b/debian/changelog
index 05f73f8c5aae7f8b19fc48d80b09c7ff22cc6582..a62111c0649d09d096fef295a154c9855553c6a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 libkohana2-php (2.3.4-1) unstable; urgency=low
 
+  [ Sven Velt ]
   * Initial release (Closes: #611240).
     - Strip out DejaVu-Font and depend on ttf-dejavu-core
 
- -- Sven Velt <sven@velt.de>  Thu, 20 Jan 2011 13:13:41 +0100
+  [ Sebastian Harl ]
+  * debian/patches:
+    - Added 01-font-path.diff -- let 'fontpath' point to the DejaVu fonts in
+      '/usr/share/fonts'.
+  * Do not ship a local copy of DejaVuSerif.ttf.
+
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 31 Jan 2011 15:39:40 +0100

diff --git a/debian/patches/01-font-path.diff b/debian/patches/01-font-path.diff
new file mode 100644 (file)
index 0000000..5ac0ad3
--- /dev/null
+++ b/debian/patches/01-font-path.diff
@@ -0,0 +1,17 @@
+Description: Point 'fontpath' to the DejaVu fonts in '/usr/share/fonts/'.
+Author: Sebastian Harl <tokkee@debian.org>
+Forwarded: not-needed
+
+--- libkohana2-php-2.3.4.orig/system/config/captcha.php
++++ libkohana2-php-2.3.4/system/config/captcha.php
+@@ -23,7 +23,7 @@ $config['default'] = array
+       'height'     => 50,
+       'complexity' => 4,
+       'background' => '',
+-      'fontpath'   => SYSPATH.'fonts/',
++      'fontpath'   => '/usr/share/fonts/truetype/ttf-dejavu/',
+       'fonts'      => array('DejaVuSerif.ttf'),
+       'promote'    => FALSE,
+-);
+\ No newline at end of file
++);

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..f591f78
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-font-path.diff
+

diff --git a/debian/rules b/debian/rules
index 661b99cc13ebc862fb67034bc8e532fa9ddc4722..fc3effee0e0fdb5da1e5b997d8e73282d6848c96 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,6 @@ install: build
 
        # remove DejaVu-Fonts and create symlink
        rm -rf $(CURDIR)/debian/libkohana2-php/usr/share/php/kohana2/system/fonts
-       ln -s /usr/share/fonts/truetype/ttf-dejavu \
-               $(CURDIR)/debian/libkohana2-php/usr/share/php/kohana2/system/fonts
 
        # fix permissions
        for file in `find $(CURDIR)/debian/libkohana2-php -name '*.php'`; do \