[Tux4kids-commits] r215 - in tuxtype/trunk: . tuxtype

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2007-08-27 17:09:56 +0000 (Mon, 27 Aug 2007)
New Revision: 215

Modified:
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/tuxtype/loaders.c
Log:
Fixed Debian path for Andika font


Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2007-08-25 18:14:08 UTC (rev 214)
+++ tuxtype/trunk/Makefile.am	2007-08-27 17:09:56 UTC (rev 215)
@@ -3,7 +3,7 @@
 
 SUBDIRS = tuxtype
 
-EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
+EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)

Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c	2007-08-25 18:14:08 UTC (rev 214)
+++ tuxtype/trunk/tuxtype/loaders.c	2007-08-27 17:09:56 UTC (rev 215)
@@ -222,11 +222,11 @@
   /* HACK hard-coded for Debian (and current exact font names): */ 
 
   if (strncmp(font_name, "AndikaDesRevG.ttf", FNLEN ) == 0)
-    sprintf(fn, "%s/%s", "/usr/share/fonts/truetype/ttf-sil-andika-desrev", font_name);
+    sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-andika/AndikaDesRevG.ttf");
   else if (strncmp(font_name, "DoulosSILR.ttf", FNLEN ) == 0)
-    sprintf(fn, "%s/%s", "/usr/share/fonts/truetype/ttf-sil-doulos", font_name);
+    sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-doulos/DoulosSILR.ttf");
   else if (strncmp(font_name, "Rachana_w01.ttf", FNLEN ) == 0)
-    sprintf(fn, "%s/%s", "/usr/share/fonts/truetype/ttf-malayalam-fonts", font_name);
+    sprintf(fn, "/usr/share/fonts/truetype/ttf-malayalam-fonts/Rachana_w01.ttf");