[Tux4kids-commits] r1675 - in tuxtype/people/holger/tuxtype: tarballs trunk/debian

Wed Nov 25 12:06:59 UTC 2009

Author: holger
Date: 2009-11-25 12:06:53 +0000 (Wed, 25 Nov 2009)
New Revision: 1675

Added:
   tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz
   tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5
   tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5.asc
   tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1
   tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1.asc
Modified:
   tuxtype/people/holger/tuxtype/trunk/debian/changelog
   tuxtype/people/holger/tuxtype/trunk/debian/control
   tuxtype/people/holger/tuxtype/trunk/debian/copyright
   tuxtype/people/holger/tuxtype/trunk/debian/rules
   tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.dirs
   tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.postinst
Log:
* New upstream release, quoting from the upstream changelog:
  - new music files and backgrounds contributed by Caroline Ford,
    some old sounds (the ones with suboptimal free licensing) removed -
    Tux Typing is now 100% DFSG-compliant (Closes: #400924)
  - fixed a problem that was causing the wrong key to flash in the bottom
    row of keys
  - game Instructions - simplified and reactivated cascade and laser game
    instruction scripts, fixed scripting background image so that it scales
    properly in fullscreen
  - scripting - Added some basic scripts so that new users will have a
    complete lesson set out of the box. Added a howto in the docs.
  - Sarah Frisk's word list editor from GSoC 2009 has been merged in as
    a new, somewhat "beta" feature. (Closes: #94986)
* tuxtype.postinst: Make tuxtype binary and shared wordlist directory 
  setgid games, so that wordlists can be edited and shared. This is done
  with dpkg-statoverride, so local admins can override this decission.



Added: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5
===================================================================

--- tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5	                        (rev 0)
+++ tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5	2009-11-25 12:06:53 UTC (rev 1675)
@@ -0,0 +1 @@
+7294fc19db32a3134bd4112e9cb604c4  tuxtype_1.8.0.orig.tar.gz

Added: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5.asc
===================================================================
--- tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5.asc	                        (rev 0)
+++ tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.md5.asc	2009-11-25 12:06:53 UTC (rev 1675)
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+owGbwMvMwCQYUHTBbE2EqQLjmvgk2ZLSipLKgtR4Qz0LPQO9/KLMdL2SxCK99Cq9
+3BRTb6aOEnMjS5O0ZEPLlCRjo0RjQ2OTpBQTQ0OjVMvkJDMDk2QTBQWcRnB12DOz
+MoAMgVkpyCT+k2HBgVeVttuiZKI3Z9yQvbdO/bGlwXRFhgVrP5Ta3DnJ4HDFsubW
+Bk9+Hnl/sQ8A
+=TVFM
+-----END PGP MESSAGE-----

Added: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1
===================================================================
--- tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1	                        (rev 0)
+++ tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1	2009-11-25 12:06:53 UTC (rev 1675)
@@ -0,0 +1 @@
+e33d8138b8f0907f228fe0105f6266408332d59d  tuxtype_1.8.0.orig.tar.gz

Added: tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1.asc
===================================================================
--- tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1.asc	                        (rev 0)
+++ tuxtype/people/holger/tuxtype/tarballs/tuxtype_1.8.0.orig.tar.gz.sha1.asc	2009-11-25 12:06:53 UTC (rev 1675)
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+owGbwMvMwCQYUHTBbE2EqQLjmowkuZLSipLKgtR4Qz0LPQO9/KLMdL2SxCK99Cq9
+4oxEQ2+mjvJUY+MUC0NjiySLNANLA/M0IyOLtFQDQwPTNDMjMzMTAwtjY6MUU8sU
+BQWcZnF12DOzMoAMg9ktyJRxmWGe8STG9xN5NJ/o5LMqzMyr3SOzIFGFYcH8dP1p
+4Wedlr3S5/lZ+UZohdjtr7EA
+=o35E
+-----END PGP MESSAGE-----

Modified: tuxtype/people/holger/tuxtype/trunk/debian/changelog
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/changelog	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/changelog	2009-11-25 12:06:53 UTC (rev 1675)
@@ -1,3 +1,24 @@
+tuxtype (1.8.0-1) UNRELEASED; urgency=low
+
+  * New upstream release, quoting from the upstream changelog:
+    - new music files and backgrounds contributed by Caroline Ford,
+      some old sounds (the ones with suboptimal free licensing) removed -
+      Tux Typing is now 100% DFSG-compliant (Closes: #400924)
+    - fixed a problem that was causing the wrong key to flash in the bottom
+      row of keys
+    - game Instructions - simplified and reactivated cascade and laser game
+      instruction scripts, fixed scripting background image so that it scales
+      properly in fullscreen
+    - scripting - Added some basic scripts so that new users will have a
+      complete lesson set out of the box. Added a howto in the docs.
+    - Sarah Frisk's word list editor from GSoC 2009 has been merged in as
+      a new, somewhat "beta" feature. (Closes: #94986)
+  * tuxtype.postinst: Make tuxtype binary and shared wordlist directory 
+    setgid games, so that wordlists can be edited and shared. This is done
+    with dpkg-statoverride, so local admins can override this decission.
+
+ -- Holger Levsen <holger at debian.org>  Tue, 17 Nov 2009 15:27:25 +0100
+
 tuxtype (1.7.5.dfsg1-2) unstable; urgency=low
 
   * Bump standards version to 3.8.3, no changes needed. 

Modified: tuxtype/people/holger/tuxtype/trunk/debian/control
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/control	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/control	2009-11-25 12:06:53 UTC (rev 1675)
@@ -12,7 +12,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ttf-sil-andika (>=1.0.basic-1), tuxtype-data 
 Recommends: ttf-sil-doulos, ttf-bengali-fonts, ttf-devanagari-fonts, ttf-gujarati-fonts, ttf-kannada-fonts, ttf-oriya-fonts, ttf-punjabi-fonts, ttf-tamil-fonts, ttf-telugu-fonts
-Suggests: tuxtype-data-nonfree
 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
@@ -26,6 +25,9 @@
 Package: tuxtype-data
 Architecture: all
 Recommends: tuxtype
+Replaces: tuxtype-data-nonfree
+Conflicts: tuxtype-data-nonfree
+Provides: tuxtype-data-nonfree 
 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/trunk/debian/copyright
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/copyright	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/copyright	2009-11-25 12:06:53 UTC (rev 1675)
@@ -153,17 +153,6 @@
 
 Emmett Plant (emmett at sonivius.com) is the author of tuxi.ogg and released it in the public domain.
 
-
-The following files were either declared to be in the public domain, or were allowed to be used
-freely in non-commercial products. 
-
-kmus1.wav
-kmus2.wav
-kmus3.wav
-kmus4.wav 
-click.wav
-
-
 This game is under the Gnu GPL (again, see COPYING) and is open-source. While
 this does not preclude it from being included in a commercial packade (such as a
 Linux distro) this software is required to be freely distributable. 
@@ -174,6 +163,17 @@
 
 Thx.
 
+-----------------------------------------
+
+10 Sep 2009
+
+ADDENDUM - the previously present files with license problems (kmus1-4.wav, click.wav) have all been removed
+and replaced with 100% free and redistributable alternatives.  I believe the sound files in Tux Typing are
+now fully compliant with the Debian Free Software Guidelines.
+
+David Bruce
+<davidstuartbruce at gmail.com>
+
 --------------------------------------------------------------------------------------------
 
 ConvertUTF.c/.h are from Unicode, Inc. and are released under a very free (BSD-like) license:

Modified: tuxtype/people/holger/tuxtype/trunk/debian/rules
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/rules	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/rules	2009-11-25 12:06:53 UTC (rev 1675)
@@ -26,7 +26,7 @@
 config.status: 
 	dh_testdir
 	# 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
+	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  --localstatedir=/var/games
 
 
 build: build-arch build-indep

Modified: tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.dirs
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.dirs	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.dirs	2009-11-25 12:06:53 UTC (rev 1675)
@@ -2,3 +2,4 @@
 usr/share/tuxtype
 usr/share/applications
 usr/share/pixmaps
+var/games/tuxtype/words

Modified: tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.postinst
===================================================================
--- tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.postinst	2009-11-24 23:54:32 UTC (rev 1674)
+++ tuxtype/people/holger/tuxtype/trunk/debian/tuxtype.postinst	2009-11-25 12:06:53 UTC (rev 1675)
@@ -6,6 +6,12 @@
         if [ -d /usr/doc -a -h /usr/doc/tuxtype -a -d /usr/share/doc/tuxtype ]; then
                 rm -f /usr/doc/tuxtype
         fi
+	# make tuxtype binary and shared wordlist directory setgid games
+	# and allow admin to override this decission
+	dpkg-statoverride --list /usr/games/tuxtype >/dev/null || \
+		dpkg-statoverride --update --add root games 2755 /usr/games/tuxtype
+	dpkg-statoverride --list /var/games/tuxtype/words >/dev/null || \
+		dpkg-statoverride --update --add root games 2775 /var/games/tuxtype/words
 fi
 
 #DEBHELPER#


