[Tux4kids-commits] r260 - in tuxmath/trunk: . data/fonts docs src

[dbruce-guest at alioth.debian.org]

Author: dbruce-guest
Date: 2007-09-18 16:59:01 +0000 (Tue, 18 Sep 2007)
New Revision: 260

Added:
   tuxmath/trunk/data/fonts/AndikaDesRevG.ttf
Modified:
   tuxmath/trunk/Makefile.am
   tuxmath/trunk/data/fonts/Makefile.am
   tuxmath/trunk/docs/changelog
   tuxmath/trunk/src/setup.c
Log:
Revised Makefile.am's to leave font out of "make dist" and created new make target, "dist_with_fonts" that includes 
the font; also added Andika font to svn control; trivial edit of setup.c contact info;


Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am	2007-09-18 03:02:44 UTC (rev 259)
+++ tuxmath/trunk/Makefile.am	2007-09-18 16:59:01 UTC (rev 260)
@@ -10,6 +10,14 @@
 ##datadir = @datadir@
 ##localedir = $(datadir)/locale
 
+
+# Bundle in fonts for distribution tar.gz to be used without package manager:
+# i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
+# (thanks to Ralf Wildenhues <Ralf.Wildenhues at gmx.de> for automake help!)
+dist_with_fonts:
+	$(MAKE) $(AM_MAKEFLAGS) dist dist_fonts='AndikaDesRevG.ttf'
+
+
 # This rule is a brute-force kludge! 
 install-data-local:
 	@$(NORMAL_INSTALL)

Added: tuxmath/trunk/data/fonts/AndikaDesRevG.ttf
===================================================================
(Binary files differ)


Property changes on: tuxmath/trunk/data/fonts/AndikaDesRevG.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxmath/trunk/data/fonts/Makefile.am
===================================================================
--- tuxmath/trunk/data/fonts/Makefile.am	2007-09-18 03:02:44 UTC (rev 259)
+++ tuxmath/trunk/data/fonts/Makefile.am	2007-09-18 16:59:01 UTC (rev 260)
@@ -1,3 +1,3 @@
 ## Makefile.am for tuxmath - data/fonts:
 
-EXTRA_DIST = AndikaDesRevG.ttf
+EXTRA_DIST = $(dist_fonts)

Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog	2007-09-18 03:02:44 UTC (rev 259)
+++ tuxmath/trunk/docs/changelog	2007-09-18 16:59:01 UTC (rev 260)
@@ -1,3 +1,12 @@
+2007.Sep.88 (svn.debian.org/tux4kids - revision 260)
+  Build:
+    * Modified Makefile.am and data/fonts/Makefile.am to
+      support building dist tarball either with font
+      bundled (make dist_with_fonts) or without font
+      (make dist). Added Andika font to svn.
+    
+      David Bruce <dbruce at tampabay.rr.com>
+
 2007.Sep.08 (svn.debian.org/tux4kids - revision 233)
   Code:
     * Added replacement function for scandir() (called
@@ -5,6 +14,8 @@
       under Windows - or at least isn't supported by
       mingw32.
 
+      David Bruce <dbruce at tampabay.rr.com>
+
 2007.Sep.07 (svn.debian.org/tux4kids - revision 231)
   Version 1.5.4
 

Modified: tuxmath/trunk/src/setup.c
===================================================================
--- tuxmath/trunk/src/setup.c	2007-09-18 03:02:44 UTC (rev 259)
+++ tuxmath/trunk/src/setup.c	2007-09-18 16:59:01 UTC (rev 260)
@@ -14,12 +14,12 @@
   dbruce at tampabay.rr.com
 
   Part of "Tux4Kids" Project
-  http://www.tux4kids.net/
+  http://tux4kids.alioth.debian.org/
   Subversion repository:
-  https://svn.tux4kids.net/tuxmath
+  https://svn.debian.alioth.org/tux4kids/tuxmath/
 
  
-  August 26, 2001 - August 8, 2006.
+  August 26, 2001 - Sept 18, 2007.
 */