[Tux4kids-commits] r554 - in tuxmath/people/holger/tuxmath/debian: . patches
holger at alioth.debian.org
holger at alioth.debian.org
Wed Jun 25 20:51:18 UTC 2008
Author: holger
Date: 2008-06-25 20:51:17 +0000 (Wed, 25 Jun 2008)
New Revision: 554
Added:
tuxmath/people/holger/tuxmath/debian/patches/
tuxmath/people/holger/tuxmath/debian/patches/100-ttf-sil-andika.patch
tuxmath/people/holger/tuxmath/debian/patches/series
Modified:
tuxmath/people/holger/tuxmath/debian/changelog
tuxmath/people/holger/tuxmath/debian/control
tuxmath/people/holger/tuxmath/debian/copyright
tuxmath/people/holger/tuxmath/debian/rules
Log:
tuxmath (1.6.3-3) unstable; urgency=low
* Bump Standards-version to 3.8.0, no changes needed.
* Add quilt to build-depends.
* Patch the source to use 1.0 basic release of the ttf-sil-andika fonts and
not the "design review" version.
* Add information about AndikaDesRevG.ttf which is included in the upstream
tarball and therefore in the debian source package to debian/copyright.
-- Holger Levsen <holger at debian.org> Wed, 25 Jun 2008 20:31:15 +0000
Modified: tuxmath/people/holger/tuxmath/debian/changelog
===================================================================
--- tuxmath/people/holger/tuxmath/debian/changelog 2008-06-24 18:41:41 UTC (rev 553)
+++ tuxmath/people/holger/tuxmath/debian/changelog 2008-06-25 20:51:17 UTC (rev 554)
@@ -1,3 +1,14 @@
+tuxmath (1.6.3-3) unstable; urgency=low
+
+ * Bump Standards-version to 3.8.0, no changes needed.
+ * Add quilt to build-depends.
+ * Patch the source to use 1.0 basic release of the ttf-sil-andika fonts and
+ not the "design review" version.
+ * Add information about AndikaDesRevG.ttf which is included in the upstream
+ tarball and therefore in the debian source package to debian/copyright.
+
+ -- Holger Levsen <holger at debian.org> Wed, 25 Jun 2008 20:31:15 +0000
+
tuxmath (1.6.3-2) unstable; urgency=low
* Add suggests to ttf-wqy-zenhei and remove suggests to ttf-arphic-ukai as
Modified: tuxmath/people/holger/tuxmath/debian/control
===================================================================
--- tuxmath/people/holger/tuxmath/debian/control 2008-06-24 18:41:41 UTC (rev 553)
+++ tuxmath/people/holger/tuxmath/debian/control 2008-06-25 20:51:17 UTC (rev 554)
@@ -2,15 +2,15 @@
Section: games
Priority: optional
Maintainer: Holger Levsen <holger at debian.org>
-Build-Depends: debhelper (>=5.0.42), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libx11-6, libxext6, libsdl-pango-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>=5.0.42), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libx11-6, libxext6, libsdl-pango-dev, quilt
+Standards-Version: 3.8.0
Homepage: http://tux4kids.alioth.debian.org
Vcs-Svn: svn://svn.debian.org/svn/tux4kids/tuxmath/
Vcs-Browser: http://svn.debian.org/wsvn/tux4kids/tuxmath/
Package: tuxmath
Architecture: any
-Depends: ${shlibs:Depends}, ttf-sil-andika
+Depends: ${shlibs:Depends}, ttf-sil-andika (>=1.0.basic-1)
Suggests: ttf-wqy-zenhei | ttf-arphic-uming
Description: math game for kids with Tux
"Tux, of Math Command" ("TuxMath," for short) is an
Modified: tuxmath/people/holger/tuxmath/debian/copyright
===================================================================
--- tuxmath/people/holger/tuxmath/debian/copyright 2008-06-24 18:41:41 UTC (rev 553)
+++ tuxmath/people/holger/tuxmath/debian/copyright 2008-06-25 20:51:17 UTC (rev 554)
@@ -102,3 +102,109 @@
--------------------------------------------------------------------------------------------
+/data/fonts/AndikaDesRevG.ttf comes with the following licence statement:
+
+Copyright:
+
+This Font Software is Copyright (c) 1994-2007, SIL International (http://scripts.sil.org/).
+All Rights Reserved.
+
+"Doulos SIL" is a Reserved Font Name for this Font Software.
+"SIL" is a Reserved Font Name for this Font Software.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.0.
+No modification of the license is permitted, only verbatim copy is allowed.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of cooperative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide an open
+framework in which fonts may be shared and improved in partnership with
+others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and sold with any software provided that the font
+names of derivative works are changed. The fonts and derivatives,
+however, cannot be released under any other type of license.
+
+DEFINITIONS
+"Font Software" refers to any and all of the following:
+ - font files
+ - data files
+ - source code
+ - build scripts
+ - documentation
+
+"Reserved Font Name" refers to the Font Software name as seen by
+users and any other names as specified after the copyright statement.
+
+"Standard Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder.
+
+"Modified Version" refers to any derivative font software made by
+adding to, deleting, or substituting -- in part or in whole --
+any of the components of the Standard Version, by changing formats
+or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Standard or Modified Versions, may be sold by itself.
+
+2) Standard or Modified Versions of the Font Software may be bundled,
+redistributed and sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s), in part or in whole, unless explicit written permission is
+granted by the Copyright Holder. This restriction applies to all
+references stored in the Font Software, such as the font menu name and
+other font description fields, which are used to differentiate the
+font from others.
+
+4) The name(s) of the Copyright Holder or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed using this license, and may not be distributed
+under any other license.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+--------------------------------------------------------------------------------------------
+
Added: tuxmath/people/holger/tuxmath/debian/patches/100-ttf-sil-andika.patch
===================================================================
--- tuxmath/people/holger/tuxmath/debian/patches/100-ttf-sil-andika.patch (rev 0)
+++ tuxmath/people/holger/tuxmath/debian/patches/100-ttf-sil-andika.patch 2008-06-25 20:51:17 UTC (rev 554)
@@ -0,0 +1,39 @@
+Index: tuxmath-1.6.3/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
+@@ -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
+ dist_with_fonts:
+ $(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
+ 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
++++ tuxmath-1.6.3/src/loaders.c 2008-06-25 12:09:49.000000000 +0000
+@@ -109,7 +109,7 @@
+ /* now means we are using Debian, so grab from Debian installation loc: */
+ if (!f)
+ {
+- sprintf(fontfile, "/usr/share/fonts/truetype/ttf-sil-andika/AndikaDesRevG.ttf");
++ sprintf(fontfile, "/usr/share/fonts/truetype/ttf-sil-andika/AndBasR.ttf");
+ 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
+
Added: tuxmath/people/holger/tuxmath/debian/patches/series
===================================================================
--- tuxmath/people/holger/tuxmath/debian/patches/series (rev 0)
+++ tuxmath/people/holger/tuxmath/debian/patches/series 2008-06-25 20:51:17 UTC (rev 554)
@@ -0,0 +1 @@
+100-ttf-sil-andika.patch
Modified: tuxmath/people/holger/tuxmath/debian/rules
===================================================================
--- tuxmath/people/holger/tuxmath/debian/rules 2008-06-24 18:41:41 UTC (rev 553)
+++ tuxmath/people/holger/tuxmath/debian/rules 2008-06-25 20:51:17 UTC (rev 554)
@@ -14,7 +14,6 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -26,6 +25,7 @@
config.status:
dh_testdir
# Add here commands to configure the package.
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games --enable-sdlpango
@@ -35,17 +35,18 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
-
+ $(MAKE)
+
touch build-stamp
-clean:
+clean:
dh_testdir
dh_testroot
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f build-stamp
# Add here commands to clean up after the build process.
- [ ! -e Makefil ] || $(MAKE) distclean
+ [ ! -e Makefile ] || $(MAKE) distclean
dh_clean
install: build
More information about the Tux4kids-commits
mailing list