[Tux4kids-commits] r534 - in tuxtype/people/holger: . tuxtype/debian tuxtype/debian/patches tuxtype-data-nonfree/debian
holger at alioth.debian.org
holger at alioth.debian.org
Wed Jun 18 12:53:28 UTC 2008
Author: holger
Date: 2008-06-18 12:53:28 +0000 (Wed, 18 Jun 2008)
New Revision: 534
Added:
tuxtype/people/holger/tuxtype/debian/patches/
tuxtype/people/holger/tuxtype/debian/patches/100-nynorsk-words.patch
tuxtype/people/holger/tuxtype/debian/patches/series
Modified:
tuxtype/people/holger/make_debian_packages
tuxtype/people/holger/todo
tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog
tuxtype/people/holger/tuxtype/debian/changelog
tuxtype/people/holger/tuxtype/debian/control
tuxtype/people/holger/tuxtype/debian/copyright
tuxtype/people/holger/tuxtype/debian/rules
Log:
uploaded as 1.5.17-1
Modified: tuxtype/people/holger/make_debian_packages
===================================================================
--- tuxtype/people/holger/make_debian_packages 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/make_debian_packages 2008-06-18 12:53:28 UTC (rev 534)
@@ -1,6 +1,6 @@
#!/bin/bash
-# copyright 2006-2007 Holger Levsen
+# copyright 2006-2008 Holger Levsen
# released under the GPL version2
#
# attack of the ugly scripts! i think i want to learn about svn-buildpackage next...
@@ -96,15 +96,14 @@
rm ./tuxtype-data-nonfree-$1.dfsgnonfree1 -r
for i in tuxtype_$1.dfsg1-$2.dsc tuxtype-data-nonfree_$1.dfsgnonfree1-$NFV.dsc ; do {
- echo linda and lintian runs for $i
- linda $i
+ echo lintian runs for $i
lintian $i
+ echo
} ; done
-echo linda and lintian runs for `ls *.deb`
for i in tuxtype_$1.dfsg1-$2_i386.deb tuxtype-data_$1.dfsg1-$2_all.deb tuxtype-data-nonfree_$1.dfsgnonfree1-${NFV}_all.deb ; do {
- echo linda and lintian runs for $i
- linda $i
+ echo lintian runs for $i
lintian $i
+ echo
} ; done
echo
Modified: tuxtype/people/holger/todo
===================================================================
--- tuxtype/people/holger/todo 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/todo 2008-06-18 12:53:28 UTC (rev 534)
@@ -1,13 +1,13 @@
known issues
-W: tuxtype source: debian-rules-ignores-make-clean-error line 54
.16
--.-
-OFL
+---
+fonts muessen weg ausm source paket
-/usr/share/tuxtype/data/themes/malayalam/images/keyboard/key.png
+
+/usr/mhare/tuxtype/data/themes/malayalam/images/keyboard/key.png
/usr/share/tuxtype/data/themes/malayalam/images/splat0.png
/usr/share/tuxtype/data/themes/malayalam/images/status/score.png
/usr/share/tuxtype/data/themes/malayalam/images/status/wave.png
Modified: tuxtype/people/holger/tuxtype/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype/debian/changelog 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/tuxtype/debian/changelog 2008-06-18 12:53:28 UTC (rev 534)
@@ -1,5 +1,18 @@
-tuxtype (1.5.16.dfsg1-1) UNRELEASED; urgency=low
+tuxtype (1.5.17.dfsg1-1) unstable; urgency=low
+ * New upstream version (Closes: #469941, #217448) with a new Nepali theme
+ (contributed by Vikal Acharya and Shakeel Shrestha), a greatly enhanced
+ Ialian theme as well as some visual enhancements to the menu interface.
+ * Lower dependency on ttf-malayalam-fonts to a suggests, assuming that
+ people speaking Malayalam having it installed anyway. (Closes: #481294)
+ * Lower dependency on ttf-sil-doulos to a recommends.
+ * Temporarily add quilt and automake to build-depends to be able to fix a
+ problem in the Makefile.am for Nynorsk wordlists.
+
+ -- Holger Levsen <holger at debian.org> Wed, 18 Jun 2008 11:54:08 +0000
+
+tuxtype (1.5.16.dfsg1-1) unstable; urgency=low
+
* new upstream version, containing new Wolof and Czech themes and a fixed
Russian theme
* removed cruft from rules file
@@ -7,12 +20,14 @@
* increased debhelper compat level to 5
* use dh_install as intended
* use dh_installdoc as intended
- * use dh_desktop to add maintainer script fragments to call
- update-desktop-database
- * cleaner clean target
+ * use dh_desktop to add maintainer script fragments to call
+ update-desktop-database
+ * only make clean if Makefile exists
* declare a versioned dependency on tuxtype-data (Closes: #443896)
+ * remove fonts from binary package, update debian/copyright to reflect
+ shipping them in the source package
- -- Holger Levsen <holger at debian.org> Fri, 14 Dec 2007 16:10:15 +0000
+ -- Holger Levsen <holger at debian.org> Sun, 17 Feb 2008 16:37:51 +0000
tuxtype (1.5.15.dfsg1-3) unstable; urgency=low
Modified: tuxtype/people/holger/tuxtype/debian/control
===================================================================
--- tuxtype/people/holger/tuxtype/debian/control 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/tuxtype/debian/control 2008-06-18 12:53:28 UTC (rev 534)
@@ -3,15 +3,16 @@
Priority: optional
Maintainer: Holger Levsen <holger at debian.org>
Standards-Version: 3.7.3
-Build-Depends: debhelper (>=5.0.42), libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-pango-dev
+Build-Depends: debhelper (>=5.0.42), libsdl-mixer1.2-dev, libsdl-image1.2-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-pango-dev, quilt, automake
Homepage: http://tux4kids.alioth.debian.org
Vcs-Svn: svn://svn.debian.org/svn/tux4kids/tuxtype/
Vcs-Browser: http://svn.debian.org/wsvn/tux4kids/tuxtype/
Package: tuxtype
Architecture: any
-Depends: ${shlibs:Depends}, ttf-sil-andika, ttf-sil-doulos, ttf-malayalam-fonts, tuxtype-data
-Suggests: tuxtype-data-nonfree
+Depends: ${shlibs:Depends}, ttf-sil-andika, tuxtype-data
+Recommends: ttf-sil-doulos
+Suggests: tuxtype-data-nonfree, ttf-malayalam-fonts, ttf-devanagari-fonts
Description: Educational Typing Tutor Game Starring Tux
TuxTyping is an educational typing tutorial game starring
Tux, the Linux Penguin. The player guides Tux to eat fish
@@ -25,7 +26,7 @@
Package: tuxtype-data
Architecture: all
Recommends: tuxtype
-Conflicts: tuxtype (=${binary:Version})
+Conflicts: tuxtype (<${binary:Version})
Description: Data files for the Educational Typing Tutor Game Starring Tux
This package contains graphics, sound, themes and wordlist files for tuxtype.
.
Modified: tuxtype/people/holger/tuxtype/debian/copyright
===================================================================
--- tuxtype/people/holger/tuxtype/debian/copyright 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/tuxtype/debian/copyright 2008-06-18 12:53:28 UTC (rev 534)
@@ -186,3 +186,174 @@
--------------------------------------------------------------------------------------------
+/data/fonts/AndikaDesRevG.ttf and /data/fonts/DoulosSILR.ttf come 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.
+
+--------------------------------------------------------------------------------------------
+
+/data/fonts/Dachana_w01.ttf comes with the following licence statement:
+
+Uptream Authors:
+ Baiju M <baijum81 at lycos.com>
+ Kevin & Siji <http://kevinsiji.goldeye.info>
+ Rachana Akshara Vedi <http://www.rachanamalayalam.org>
+
+Copyright:
+
+ (MalOtf.ttf)
+ Copyright (C) Jeroen Hellingman <jehe at kabelfoon.nl>,
+ N.V Shaji <nvshaji at yahoo.com>
+
+ (AnjaliOldLipi-0.730.ttf)
+ Copyright (C) 2004 Kevin & Siji
+
+ (Rachana_w01.ttf)
+ Copyright (C) 2005 Rachana Akshara Vedi <http://www.rachanamalayalam.org>
+
+License:
+
+ Rachana is a language campaign forum for the Original script of Malayalam
+ in the digital computing. It started in 1999 under the leadership of
+ R. Chitrajakumar (Malayalam Lexicon, Kerala University, Palayalm,
+ Thiruvananthapuram). Hussain KH (KFRI, Kerala Forest Research Institute,
+ Peechi, Thrissur) is the project coordinator who designed the font.
+ Other Members are: Gangadharan N (Malayalam Lexicon) who assisted
+ Chitrajakumar in compiling the exhaustive character set of Malayalam;
+ Dr. P Vijayakumaran Nair (KFRI) who assisted in programming the Rachana
+ text editor which was used by many from 1999 to 2005 to typeset Books
+ and journal articles in the old Lipi; Subash Kuriakose (KFRI) who gave
+ advice to Hussain in the many aspects of Malayalam calligraphy. Later in
+ 2004 Rajeev J Sebastian joined the Rachana team, whose mastery in Linux
+ and untiring work is elevating the campaign to materialize its highest
+ dream that to embed the original script in the OS enabling it in the
+ whole field of digital applications. Dr. Mammen Chundamannil (KFRI) is
+ an ardent supporter and well wisher of Rachana whose article 'For our
+ language, our script' has spread the vision and objectives of Rachana to
+ the whole world.
+
+ There seems to be some confusion regarding the license of Rachana.
+ Praveen has confirmed that Rachana is indeed under GPL. Any queries
+ regarding the exact status of Rachana license issue should be directed
+ to Praveen <pravi.a at gmail.com>
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License can be
+found in /usr/share/common-licenses/GPL-2 and /usr/share/common-licenses/GPL.
+
+--------------------------------------------------------------------------------------------
+
Added: tuxtype/people/holger/tuxtype/debian/patches/100-nynorsk-words.patch
===================================================================
--- tuxtype/people/holger/tuxtype/debian/patches/100-nynorsk-words.patch (rev 0)
+++ tuxtype/people/holger/tuxtype/debian/patches/100-nynorsk-words.patch 2008-06-18 12:53:28 UTC (rev 534)
@@ -0,0 +1,16 @@
+Index: tuxtype-1.5.17.dfsg1/tuxtype/data/themes/nynorsk/words/Makefile.am
+===================================================================
+--- tuxtype-1.5.17.dfsg1.orig/tuxtype/data/themes/nynorsk/words/Makefile.am 2008-06-17 17:32:52.000000000 +0000
++++ tuxtype-1.5.17.dfsg1/tuxtype/data/themes/nynorsk/words/Makefile.am 2008-06-17 17:33:08.000000000 +0000
+@@ -1,9 +1,9 @@
+ ## Makefile.am for tuxtype - data/themes/nynorsk/words:
+ ## Process with Automake to create Makefile.in
+
+-themes_nynorsk_images_wordsdir = $(pkgdatadir)/data/themes/nynorsk/images/words
++themes_nynorsk_wordsdir = $(pkgdatadir)/data/themes/nynorsk/words
+
+-dist_themes_nynorsk_images_words_DATA = 3boks.txt \
++dist_themes_nynorsk_words_DATA = 3boks.txt \
+ 4boks.txt \
+ 5boks.txt \
+ 6boks.txt \
Added: tuxtype/people/holger/tuxtype/debian/patches/series
===================================================================
--- tuxtype/people/holger/tuxtype/debian/patches/series (rev 0)
+++ tuxtype/people/holger/tuxtype/debian/patches/series 2008-06-18 12:53:28 UTC (rev 534)
@@ -0,0 +1 @@
+100-nynorsk-words.patch
Modified: tuxtype/people/holger/tuxtype/debian/rules
===================================================================
--- tuxtype/people/holger/tuxtype/debian/rules 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/tuxtype/debian/rules 2008-06-18 12:53:28 UTC (rev 534)
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -26,6 +25,9 @@
config.status:
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ # because we patch a Makefile.am to fix nynorsk in 1.5.17
+ autoreconf --install
# Add here commands to configure the package.
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
@@ -48,8 +50,9 @@
clean:
dh_testdir
dh_testroot
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f build-arch-stamp build-indep-stamp install-stamp
- $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) clean
dh_clean
@@ -65,6 +68,9 @@
dh_installdirs -ptuxtype-data usr/share/
dh_installdirs
cp $(CURDIR)/debian/tuxtype.xpm $(CURDIR)/debian/tuxtype/usr/share/tuxtype/tuxtype.xpm
+ rm $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts/*.ttf
+ rmdir $(CURDIR)/debian/tmp/usr/share/tuxtype/data/fonts
+
touch install-stamp
install-arch: install
Modified: tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog 2008-06-18 12:04:16 UTC (rev 533)
+++ tuxtype/people/holger/tuxtype-data-nonfree/debian/changelog 2008-06-18 12:53:28 UTC (rev 534)
@@ -1,3 +1,9 @@
+tuxtype-data-nonfree (1.5.17.dfsgnonfree1-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Holger Levsen <holger at debian.org> Wed, 18 Jun 2008 11:54:15 +0000
+
tuxtype-data-nonfree (1.5.16.dfsgnonfree1-1) unstable; urgency=low
* new upstream version
More information about the Tux4kids-commits
mailing list