Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package lightyears
Revision 1.4-2 fixes a patch in 1.4-1 which unconditionally disabled sound
for all users (bug #742473). Several users consider this bug important.
unblock lightyears/1.4-2
-- DEBDIFF
diff -Nru lightyears-1.4/debian/changelog lightyears-1.4/debian/changelog
--- lightyears-1.4/debian/changelog 2011-07-22 01:49:49.000000000 +0200
+++ lightyears-1.4/debian/changelog 2014-12-21 22:29:04.000000000 +0100
@@ -1,3 +1,12 @@
+lightyears (1.4-2) unstable; urgency=medium
+
+ * debian/patches/snd_disabled_typo.patch:
+ - Move pygame.mixer to a place where pygame has already started up;
+ it was unconditionally disabling sound. Thanks to Allan Wirth
+ for diagnosing this (Closes: #742473).
+
+ -- Siegfried-Angel Gevatter Pujals <rai...@ubuntu.com> Sun, 21 Dec 2014
22:26:54 +0100
+
lightyears (1.4-1) unstable; urgency=low
* New upstream version. Some of the changes are:
diff -Nru lightyears-1.4/debian/patches/snd_disabled_typo.patch
lightyears-1.4/debian/patches/snd_disabled_typo.patch
--- lightyears-1.4/debian/patches/snd_disabled_typo.patch 2011-07-22
00:34:03.000000000 +0200
+++ lightyears-1.4/debian/patches/snd_disabled_typo.patch 2014-12-21
22:26:23.000000000 +0100
@@ -1,14 +1,29 @@
Description: Fix typo in variable name
Author: Siegfried-Angel Gevatter Pujals <rai...@ubuntu.com>
+Index: lightyears-1.4/code/resource.py
+===================================================================
--- lightyears-1.4.orig/code/resource.py
+++ lightyears-1.4/code/resource.py
-@@ -15,7 +15,7 @@ __snd_cache = dict()
+@@ -14,9 +14,6 @@ __img_cache = dict()
+ __snd_cache = dict()
__snd_disabled = False
- if not pygame.mixer or not pygame.mixer.get_init():
+-if not pygame.mixer or not pygame.mixer.get_init():
- __snd__disabled = True
-+ __snd_disabled = True
-
+-
DATA_DIR = os.path.abspath(os.path.join(
os.path.dirname(sys.argv[ 0 ]), "data"))
+
+@@ -88,7 +85,10 @@ def Load_Font(size):
+
+ def Load_Sound(name):
+ global __snd_cache, __snd_disabled
+-
++
++ if not pygame.mixer or not pygame.mixer.get_init():
++ __snd_disabled = True
++
+ if ( __snd_disabled ):
+ return None
+
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
