[Tux4kids-commits] r909 - in tuxmath/people/holger/trunk/debian: . patches

[holger at alioth.debian.org]

Author: holger
Date: 2009-02-28 21:41:12 +0000 (Sat, 28 Feb 2009)
New Revision: 909

Modified:
   tuxmath/people/holger/trunk/debian/
   tuxmath/people/holger/trunk/debian/patches/100-ttf-sil-andika.patch
Log:
- ran 'svn propset mergeWithUpstream 1 debian'
- adopted the font patch to 1.7.1




Property changes on: tuxmath/people/holger/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: tuxmath/people/holger/trunk/debian/patches/100-ttf-sil-andika.patch
===================================================================
--- tuxmath/people/holger/trunk/debian/patches/100-ttf-sil-andika.patch	2009-02-28 21:09:03 UTC (rev 908)
+++ tuxmath/people/holger/trunk/debian/patches/100-ttf-sil-andika.patch	2009-02-28 21:41:12 UTC (rev 909)
@@ -1,16 +1,16 @@
-Index: tuxmath-1.6.3/Makefile.am
+Index: tuxmath-1.7.1/Makefile.am
 ===================================================================
---- tuxmath-1.6.3.orig/Makefile.am	2008-06-25 12:08:13.000000000 +0000
-+++ tuxmath-1.6.3/Makefile.am	2008-06-25 12:10:10.000000000 +0000
+--- tuxmath-1.7.1.orig/Makefile.am	2008-06-25 12:08:13.000000000 +0000
++++ tuxmath-1.7.1/Makefile.am	2008-06-25 12:10:10.000000000 +0000
 @@ -35,7 +35,7 @@
  ## in this Makefile.am before the 'dist_with_fonts' target for that target
  ## to work - if it is in data/fonts/Makefile.am, it does not get expanded
  ## before the 'dist' target starts:
--data_fonts = AndikaDesRevG.ttf
-+data_fonts = AndBasR.ttf
+-data_fonts='AndikaDesRevG.ttf'
++data_fonts='AndBasR.ttf'
  dist_with_fonts:
  	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
-   dist_fonts=$(data_fonts) dist
+            dist_fonts=$(data_fonts) dist
 Index: tuxmath-1.6.3/src/loaders.c
 ===================================================================
 --- tuxmath-1.6.3.orig/src/loaders.c	2008-06-25 12:08:12.000000000 +0000
@@ -24,16 +24,3 @@
      f = TTF_OpenFont(fontfile, font_size);
    }
  
-Index: tuxmath-1.6.3/src/tuxmath.h
-===================================================================
---- tuxmath-1.6.3.orig/src/tuxmath.h	2008-06-25 12:08:12.000000000 +0000
-+++ tuxmath-1.6.3/src/tuxmath.h	2008-06-25 12:10:03.000000000 +0000
-@@ -99,7 +99,7 @@
- #define MIN_COMETS 1
- #define MAX_MAX_COMETS 100
- 
--#define DEFAULT_FONT_NAME "AndikaDesRevG.ttf"
-+#define DEFAULT_FONT_NAME "AndBasR.ttf"
- #define DEFAULT_MENU_FONT_SIZE 18
- #define DEFAULT_HELP_FONT_SIZE 32
-