r9659 - in packages/trunk/fretsonfire/debian: . patches

[Matthew Johnson]

Author: mjj29
Date: 2009-05-02 18:16:25 +0000 (Sat, 02 May 2009)
New Revision: 9659

Added:
   packages/trunk/fretsonfire/debian/patches/credits_music.patch
Modified:
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/patches/series
Log:
This using sectoid/Feelings instead of defy as
the song for the credits. I'd like to ignore
errors / disable music there, since we can't
guarantee that even Feelings will be available,
but I can't figure out how to catch the
exception this bit of code is throwing.



Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2009-05-02 16:38:57 UTC (rev 9658)
+++ packages/trunk/fretsonfire/debian/changelog	2009-05-02 18:16:25 UTC (rev 9659)
@@ -1,3 +1,9 @@
+fretsonfire (1.3.110.dfsg-2) unstable; urgency=low
+
+  * Change credits to use sectoid/Feelings instead of defy. I'd like to ignore the error / have no music, but that doesn't seem to work. I can't figure out how to catch the exception. (Closes: #526399)
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sat, 02 May 2009 19:13:16 +0100
+
 fretsonfire (1.3.110.dfsg-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]

Added: packages/trunk/fretsonfire/debian/patches/credits_music.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/credits_music.patch	                        (rev 0)
+++ packages/trunk/fretsonfire/debian/patches/credits_music.patch	2009-05-02 18:16:25 UTC (rev 9659)
@@ -0,0 +1,19 @@
+# This using sectoid/Feelings instead of defy as the song for the credits. I'd
+# like to ignore errors / disable music there, since we can't guarantee that
+# even Feelings will be available, but I can't figure out how to catch the
+# exception this bit of code is throwing.
+Index: fretsonfire-1.3.110.dfsg/src/Credits.py
+===================================================================
+--- fretsonfire-1.3.110.dfsg.orig/src/Credits.py	2009-05-02 17:35:45.272567223 +0100
++++ fretsonfire-1.3.110.dfsg/src/Credits.py	2009-05-02 19:05:44.064542527 +0100
+@@ -91,8 +91,8 @@
+     self.engine      = engine
+     self.time        = 0.0
+     self.offset      = 1.0
+-    self.songLoader  = self.engine.resource.load(self, "song", lambda: Song.loadSong(self.engine, "defy", playbackOnly = True),
+-                                                 onLoad = self.songLoaded)
++    self.songLoader  = self.engine.resource.load(self, "song", lambda: Song.loadSong(self.engine, "sectoid/Feelings", playbackOnly = True),
++                                                    onLoad = self.songLoaded)
+     self.engine.loadSvgDrawing(self, "background1", "editor.svg")
+     self.engine.loadSvgDrawing(self, "background2", "keyboard.svg")
+     self.engine.loadSvgDrawing(self, "background3", "cassette.svg")

Modified: packages/trunk/fretsonfire/debian/patches/series
===================================================================
--- packages/trunk/fretsonfire/debian/patches/series	2009-05-02 16:38:57 UTC (rev 9658)
+++ packages/trunk/fretsonfire/debian/patches/series	2009-05-02 18:16:25 UTC (rev 9659)
@@ -4,3 +4,4 @@
 fonts_lower_cpu.patch
 fix_window_height_bug.patch
 keep_sound_when_failed.patch
+credits_music.patch