[Python-apps-commits] r430 - in packages/lightyears/trunk/debian (5 files)

[rainct-guest at users.alioth.debian.org]

    Date: Sunday, December 16, 2007 @ 23:11:29
  Author: rainct-guest
Revision: 430

evil svn

Added:
  packages/lightyears/trunk/debian/install
Deleted:
  packages/lightyears/trunk/debian/lightyears-doc.install
  packages/lightyears/trunk/debian/lightyears-sound.install
  packages/lightyears/trunk/debian/lightyears.install
  packages/lightyears/trunk/debian/patches/disable_soundfile_warnings.patch

Added: packages/lightyears/trunk/debian/install
===================================================================
--- packages/lightyears/trunk/debian/install	                        (rev 0)
+++ packages/lightyears/trunk/debian/install	2007-12-16 23:11:29 UTC (rev 430)
@@ -0,0 +1,23 @@
+lightyears usr/games/
+code/* usr/share/games/lightyears/code/
+
+data/0* usr/share/games/lightyears/data/
+data/b* usr/share/games/lightyears/data/
+data/c* usr/share/games/lightyears/data/
+data/d* usr/share/games/lightyears/data/
+data/g* usr/share/games/lightyears/data/
+data/he* usr/share/games/lightyears/data/
+data/m* usr/share/games/lightyears/data/
+data/n* usr/share/games/lightyears/data/
+data/r* usr/share/games/lightyears/data/
+data/s* usr/share/games/lightyears/data/
+data/u* usr/share/games/lightyears/data/
+data/w* usr/share/games/lightyears/data/
+
+audio/*.ogg usr/share/games/lightyears/audio/
+
+manual/* usr/share/doc/lightyears/html/
+data/html* usr/share/doc/lightyears/html/images/
+
+debian/lightyears.desktop usr/share/applications/
+debian/lightyears.xpm usr/share/pixmaps/

Deleted: packages/lightyears/trunk/debian/lightyears-doc.install
===================================================================
--- packages/lightyears/trunk/debian/lightyears-doc.install	2007-12-16 22:35:05 UTC (rev 429)
+++ packages/lightyears/trunk/debian/lightyears-doc.install	2007-12-16 23:11:29 UTC (rev 430)
@@ -1,4 +0,0 @@
-manual/* usr/share/doc/lightyears/html/
-data/006metal.jpg usr/share/doc/lightyears/html/images/
-data/header.jpg usr/share/doc/lightyears/html/images/
-data/html* usr/share/doc/lightyears/html/images/

Deleted: packages/lightyears/trunk/debian/lightyears-sound.install
===================================================================
--- packages/lightyears/trunk/debian/lightyears-sound.install	2007-12-16 22:35:05 UTC (rev 429)
+++ packages/lightyears/trunk/debian/lightyears-sound.install	2007-12-16 23:11:29 UTC (rev 430)
@@ -1 +0,0 @@
-audio/* usr/share/games/lightyears/audio/

Deleted: packages/lightyears/trunk/debian/lightyears.install
===================================================================
--- packages/lightyears/trunk/debian/lightyears.install	2007-12-16 22:35:05 UTC (rev 429)
+++ packages/lightyears/trunk/debian/lightyears.install	2007-12-16 23:11:29 UTC (rev 430)
@@ -1,18 +0,0 @@
-lightyears usr/games/
-code/* usr/share/games/lightyears/code/
-
-data/0* usr/share/games/lightyears/data/
-data/b* usr/share/games/lightyears/data/
-data/c* usr/share/games/lightyears/data/
-data/d* usr/share/games/lightyears/data/
-data/g* usr/share/games/lightyears/data/
-data/he* usr/share/games/lightyears/data/
-data/m* usr/share/games/lightyears/data/
-data/n* usr/share/games/lightyears/data/
-data/r* usr/share/games/lightyears/data/
-data/s* usr/share/games/lightyears/data/
-data/u* usr/share/games/lightyears/data/
-data/w* usr/share/games/lightyears/data/
-
-debian/lightyears.desktop usr/share/applications/
-debian/lightyears.xpm usr/share/pixmaps/

Deleted: packages/lightyears/trunk/debian/patches/disable_soundfile_warnings.patch
===================================================================
--- packages/lightyears/trunk/debian/patches/disable_soundfile_warnings.patch	2007-12-16 22:35:05 UTC (rev 429)
+++ packages/lightyears/trunk/debian/patches/disable_soundfile_warnings.patch	2007-12-16 23:11:29 UTC (rev 430)
@@ -1,36 +0,0 @@
-diff -Nur lightyears-1.3/code/resource.py lightyears-1.3.new/code/resource.py
---- lightyears-1.3/code/resource.py	2007-11-17 16:26:23.000000000 +0100
-+++ lightyears-1.3.new/code/resource.py	2007-11-17 16:31:47.000000000 +0100
-@@ -13,6 +13,7 @@
- __img_cache = dict()
- __snd_cache = dict()
- __snd_disabled = False
-+__printed_sound_warning = False   # only in Debian package
- 
- DATA_DIR = os.path.abspath(os.path.join(
-                 os.path.dirname(sys.argv[ 0 ]), "data"))
-@@ -62,11 +63,23 @@
-     return f
- 
- def Load_Sound(name):
--    global __snd_cache, __snd_disabled
-+    global __snd_cache, __snd_disabled, __printed_sound_warning
-    
-     if ( __snd_disabled ):
-         return None
- 
-+    # ----------------------------------------------------------
-+    # The following fragment was added by Siegfried Gevatter,
-+    # the maintainer of "lighyears" in Debian, to avoid it
-+    # complaining about missing sound files when package
-+    # "lightyears-sound" isn't installed.
-+    if not os.path.exists('/usr/share/games/lightyears/audio/'):
-+        if not __printed_sound_warning:
-+            print "Notice: No sound available, please install \"lightyears-sound\" if you want it."
-+            __printed_sound_warning = True
-+        return None
-+    # ----------------------------------------------------------
-+
-     if ( __snd_cache.has_key(name) ):
-         return __snd_cache[ name ]
-