[med-svn] r7395 - in trunk/packages/circos/trunk/debian: . patches

[olivier sallou]

Author: osallou-guest
Date: 2011-08-09 07:10:09 +0000 (Tue, 09 Aug 2011)
New Revision: 7395

Added:
   trunk/packages/circos/trunk/debian/patches/use_ttf_fonts
   trunk/packages/circos/trunk/debian/postinst
Modified:
   trunk/packages/circos/trunk/debian/circos-fonts.install
   trunk/packages/circos/trunk/debian/control
   trunk/packages/circos/trunk/debian/docs
   trunk/packages/circos/trunk/debian/patches/series
   trunk/packages/circos/trunk/debian/rules
Log:
use fonts package, adapt to upstream changes

Modified: trunk/packages/circos/trunk/debian/circos-fonts.install
===================================================================
--- trunk/packages/circos/trunk/debian/circos-fonts.install	2011-08-08 20:02:06 UTC (rev 7394)
+++ trunk/packages/circos/trunk/debian/circos-fonts.install	2011-08-09 07:10:09 UTC (rev 7395)
@@ -1 +1 @@
-fonts/* usr/share/circos/fonts/
+fonts/symbols usr/share/circos/fonts/

Modified: trunk/packages/circos/trunk/debian/control
===================================================================
--- trunk/packages/circos/trunk/debian/control	2011-08-08 20:02:06 UTC (rev 7394)
+++ trunk/packages/circos/trunk/debian/control	2011-08-09 07:10:09 UTC (rev 7395)
@@ -12,7 +12,7 @@
 
 Package: circos
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, perl (>= 5.10), circos-fonts,
+Depends: ${misc:Depends}, ${perl:Depends}, perl (>= 5.10), circos-fonts, fonts-cmu,
  libregexp-common-perl, libcarp-always-perl, libconfig-general-perl,
  libdata-dumper-simple-perl, libgd-gd2-perl, libgetopt-simple-perl,
  libmath-bezier-perl, libmath-round-perl, libparams-validate-perl, libreadonly-perl,

Modified: trunk/packages/circos/trunk/debian/docs
===================================================================
--- trunk/packages/circos/trunk/debian/docs	2011-08-08 20:02:06 UTC (rev 7394)
+++ trunk/packages/circos/trunk/debian/docs	2011-08-09 07:10:09 UTC (rev 7395)
@@ -1 +1,5 @@
 debian/README
+CHANGES
+README.tools
+README.tutorials
+fonts/README.fonts

Modified: trunk/packages/circos/trunk/debian/patches/series
===================================================================
--- trunk/packages/circos/trunk/debian/patches/series	2011-08-08 20:02:06 UTC (rev 7394)
+++ trunk/packages/circos/trunk/debian/patches/series	2011-08-09 07:10:09 UTC (rev 7395)
@@ -1,2 +1,3 @@
+use_ttf_fonts
 debianpackaging
 configpath_add_etc

Added: trunk/packages/circos/trunk/debian/patches/use_ttf_fonts
===================================================================
--- trunk/packages/circos/trunk/debian/patches/use_ttf_fonts	                        (rev 0)
+++ trunk/packages/circos/trunk/debian/patches/use_ttf_fonts	2011-08-09 07:10:09 UTC (rev 7395)
@@ -0,0 +1,46 @@
+Author: Olivier Sallou <olivier.sallou at irisa.fr>
+Description: fonts-cmu use ttf, so update conf accordingly
+Last-Update: 2011-09-08
+--- a/etc/fonts.conf
++++ b/etc/fonts.conf
+@@ -2,24 +2,24 @@
+ # Helvetica has been replaced by Computer Modern
+ # http://cm-unicode.sourceforge.net/
+ 
+-serif_roman    = fonts/modern/cmunrm.otf
+-serif_default  = fonts/modern/cmunrm.otf
+-serif_normal   = fonts/modern/cmunrm.otf
+-serif_bold     = fonts/modern/cmunbx.otf
+-serif_italic   = fonts/modern/cmunui.otf
++serif_roman    = fonts/modern/cmunrm.ttf
++serif_default  = fonts/modern/cmunrm.ttf
++serif_normal   = fonts/modern/cmunrm.ttf
++serif_bold     = fonts/modern/cmunbx.ttf
++serif_italic   = fonts/modern/cmunui.ttf
+ 
+-light          = fonts/modern/cmunss.otf
+-normal         = fonts/modern/cmunss.otf
+-default        = fonts/modern/cmunss.otf
+-condensed      = fonts/modern/cmunss.otf
+-semibold       = fonts/modern/cmunbsr.otf
+-condensedbold  = fonts/modern/cmunbsr.otf
+-bold           = fonts/modern/cmunsx.otf
++light          = fonts/modern/cmunss.ttf
++normal         = fonts/modern/cmunss.ttf
++default        = fonts/modern/cmunss.ttf
++condensed      = fonts/modern/cmunss.ttf
++semibold       = fonts/modern/cmunbsr.ttf
++condensedbold  = fonts/modern/cmunbsr.ttf
++bold           = fonts/modern/cmunsx.ttf
+ 
+-mono           = fonts/modern/cmuntt.otf
+-fixed          = fonts/modern/cmuntt.otf
+-mono_light     = fonts/modern/cmunbtl.otf
+-fixed_light    = fonts/modern/cmunbtl.otf
++mono           = fonts/modern/cmuntt.ttf
++fixed          = fonts/modern/cmuntt.ttf
++mono_light     = fonts/modern/cmunbtl.ttf
++fixed_light    = fonts/modern/cmunbtl.ttf
+ 
+ # All wingding and webding fonts have been replaced
+ # by a GPL glyph font designed by Martin Krzywinski

Added: trunk/packages/circos/trunk/debian/postinst
===================================================================
--- trunk/packages/circos/trunk/debian/postinst	                        (rev 0)
+++ trunk/packages/circos/trunk/debian/postinst	2011-08-09 07:10:09 UTC (rev 7395)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+case "$1" in
+    configure)
+        if [ ! -e /usr/share/circos/fonts/modern ] ; then
+           ln -s /usr/share/fonts/truetype/cmu /usr/share/circos/fonts/modern
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
+

Modified: trunk/packages/circos/trunk/debian/rules
===================================================================
--- trunk/packages/circos/trunk/debian/rules	2011-08-08 20:02:06 UTC (rev 7394)
+++ trunk/packages/circos/trunk/debian/rules	2011-08-09 07:10:09 UTC (rev 7395)
@@ -15,7 +15,6 @@
 	find debian/circos -type f | xargs sed -i 's/include etc/include \/usr\/share\/circos\/etc/g'
 	find debian/circos -type f | xargs sed -i 's/include fonts/include \/usr\/share\/circos\/fonts/g'
 	find debian/circos -type f | xargs sed -i 's/include tiles/include \/usr\/share\/circos\/tiles/g'
-	chmod 644 debian/circos-fonts/usr/share/circos/fonts/pointers/*
 
 override_dh_builddeb:
 	dh_builddeb -- -Z bzip2