[Python-apps-commits] r10002 - in packages/phatch/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Saturday, August 31, 2013 @ 21:30:45
  Author: piotr
Revision: 10002

Removed unneeded font package dependency for phatch-cli (closes: 555984) - thanks to Osamu Aoki for the patch

Added:
  packages/phatch/trunk/debian/patches/
  packages/phatch/trunk/debian/patches/default_font.patch
  packages/phatch/trunk/debian/patches/series
Modified:
  packages/phatch/trunk/debian/changelog
  packages/phatch/trunk/debian/control
Deleted:
  packages/phatch/trunk/debian/phatch-cli.links

Modified: packages/phatch/trunk/debian/changelog
===================================================================
--- packages/phatch/trunk/debian/changelog	2013-08-31 20:43:48 UTC (rev 10001)
+++ packages/phatch/trunk/debian/changelog	2013-08-31 21:30:45 UTC (rev 10002)
@@ -10,6 +10,9 @@
   [ Piotr Ożarowski ]
   * do_not_raise_string_exceptions.patch removed (applied upstream)
 
+  [ Osamu Aoki ]
+  * Removed unneeded font package dependency for phatch-cli (closes: 555984)
+
  -- Barry Warsaw <barry at python.org>  Wed, 22 May 2013 15:39:50 -0400
 
 phatch (0.2.7.1-2) unstable; urgency=low

Modified: packages/phatch/trunk/debian/control
===================================================================
--- packages/phatch/trunk/debian/control	2013-08-31 20:43:48 UTC (rev 10001)
+++ packages/phatch/trunk/debian/control	2013-08-31 21:30:45 UTC (rev 10002)
@@ -46,8 +46,6 @@
          python-notify,
          python-pyexiv2 (>= 0.3),
          libtiff-tools,
-         fonts-freefont-ttf,
-         fonts-thai-tlwg,
          locate | mlocate
 # move Recommends to phatch-plugins if we'll decide to split out plugins:
 Recommends: xcftools,

Added: packages/phatch/trunk/debian/patches/default_font.patch
===================================================================
--- packages/phatch/trunk/debian/patches/default_font.patch	                        (rev 0)
+++ packages/phatch/trunk/debian/patches/default_font.patch	2013-08-31 21:30:45 UTC (rev 10002)
@@ -0,0 +1,32 @@
+Author: Osamu Aoki <osamu at debian.org>
+Description: Let phatch use sans-serif for the font default
+ phatch ships FreeSans.ttf and Purisa.ttf in its source assumes to use 
+ them as the default for some dialogues.  On Debian system, these fonts
+ from its source are not used.  Previously, those fonts were made 
+ available in usr/share/phatch/data/fonts/ by creating symlinks and 
+ providing package dependency to ttf-freefont and ttf-thai-tlwg.
+ Since official fontconfig default name for such San Serif Font group 
+ is "san-serif", I replce such default font specification to this.
+ This should allow us to remove the unneeded font package dependency.
+--- a/data/actionlists/polaroid.phatch
++++ b/data/actionlists/polaroid.phatch
+@@ -28,7 +28,7 @@
+                          '__enabled__': 'yes'},
+               'label': 'Border'},
+              {'fields': {'Color': u'#443fa5',
+-                         'Font': u'Purisa',
++                         'Font': u'sans-serif',
+                          'Horizontal Justification': 'Middle',
+                          'Horizontal Offset': '50%',
+                          'Offset': '5%',
+--- a/phatch/actions/text.py
++++ b/phatch/actions/text.py
+@@ -78,7 +78,7 @@
+     def interface(self, fields):
+         fields[_t('Text')] = self.CharField(
+             choices=self.STAMPS)
+-        fields[_t('Font')] = self.FontFileField('Free Sans')
++        fields[_t('Font')] = self.FontFileField('sans-serif')
+         fields[_t('Size')] = self.PixelField('5%',
+                                             choices=self.SMALL_PIXELS)
+         fields[_t('Color')] = self.ColorField('#000000')

Added: packages/phatch/trunk/debian/patches/series
===================================================================
--- packages/phatch/trunk/debian/patches/series	                        (rev 0)
+++ packages/phatch/trunk/debian/patches/series	2013-08-31 21:30:45 UTC (rev 10002)
@@ -0,0 +1 @@
+default_font.patch

Deleted: packages/phatch/trunk/debian/phatch-cli.links
===================================================================
--- packages/phatch/trunk/debian/phatch-cli.links	2013-08-31 20:43:48 UTC (rev 10001)
+++ packages/phatch/trunk/debian/phatch-cli.links	2013-08-31 21:30:45 UTC (rev 10002)
@@ -1,2 +0,0 @@
-/usr/share/fonts/truetype/freefont/FreeSans.ttf /usr/share/phatch/data/fonts/FreeSans.ttf
-/usr/share/fonts/truetype/thai/Purisa.ttf /usr/share/phatch/data/fonts/Purisa.ttf