r8448 - in packages/trunk/prboom/debian: . patches

[Jon Dowland]

Author: jmtd-guest
Date: 2008-11-23 23:24:40 +0000 (Sun, 23 Nov 2008)
New Revision: 8448

Removed:
   packages/trunk/prboom/debian/patches/default_music_off.patch
Modified:
   packages/trunk/prboom/debian/changelog
   packages/trunk/prboom/debian/control
   packages/trunk/prboom/debian/patches/series
Log:
recommends: timidity (and re-enable music)

Modified: packages/trunk/prboom/debian/changelog
===================================================================
--- packages/trunk/prboom/debian/changelog	2008-11-23 22:28:47 UTC (rev 8447)
+++ packages/trunk/prboom/debian/changelog	2008-11-23 23:24:40 UTC (rev 8448)
@@ -1,3 +1,12 @@
+prboom (2:2.5.0+dfsg1-2) experimental; urgency=low
+
+  * Re-enable music, but Recommends: timidity. Bug
+    #472087 can hit where timidity is not available and the
+    user has a non-functioning (but present) /dev/sequencer,
+    so Recommends: it to limit exposure.
+
+ -- Jon Dowland <jon+bts at alcopop.org>  Sun, 23 Nov 2008 23:19:03 +0000
+
 prboom (2:2.5.0+dfsg1-1) experimental; urgency=low
 
   * new upstream version

Modified: packages/trunk/prboom/debian/control
===================================================================
--- packages/trunk/prboom/debian/control	2008-11-23 22:28:47 UTC (rev 8447)
+++ packages/trunk/prboom/debian/control	2008-11-23 23:24:40 UTC (rev 8448)
@@ -13,7 +13,7 @@
 Package: prboom
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: boom-wad | doom-wad
+Recommends: boom-wad | doom-wad, timidity
 Suggests: game-data-packager
 Provides: doom-engine, lxdoom
 Conflicts: lxdoom (<< 2:2.4.7)

Deleted: packages/trunk/prboom/debian/patches/default_music_off.patch
===================================================================
--- packages/trunk/prboom/debian/patches/default_music_off.patch	2008-11-23 22:28:47 UTC (rev 8447)
+++ packages/trunk/prboom/debian/patches/default_music_off.patch	2008-11-23 23:24:40 UTC (rev 8448)
@@ -1,17 +0,0 @@
-This disables music by default. There's a long-standing
-bug with hardware music playback that hasn't yet been
-fixed: see <http://bugs.debian.org/472087>.
-
-                            -- Jon Dowland <jon at alcopop.org>
-
---- a/src/m_misc.c~	2006-11-19 17:44:42.000000000 +0000
-+++ b/src/m_misc.c	2008-07-21 17:56:54.000000000 +0100
-@@ -290,7 +290,7 @@
-   {"Sound settings",{NULL},{0},UL,UL,def_none,ss_none},
-   {"sound_card",{&snd_card},{-1},-1,7,       // jff 1/18/98 allow Allegro drivers
-    def_int,ss_none}, // select sounds driver (DOS), -1 is autodetect, 0 is none; in Linux, non-zero enables sound
--  {"music_card",{&mus_card},{-1},-1,9,       //  to be set,  -1 = autodetect
-+  {"music_card",{&mus_card},{0},-1,9,       //  to be set,  -1 = autodetect
-    def_int,ss_none}, // select music driver (DOS), -1 is autodetect, 0 is none"; in Linux, non-zero enables music
-   {"pitched_sounds",{&pitched_sounds},{0},0,1, // killough 2/21/98
-    def_bool,ss_none}, // enables variable pitch in sound effects (from id's original code)

Modified: packages/trunk/prboom/debian/patches/series
===================================================================
--- packages/trunk/prboom/debian/patches/series	2008-11-23 22:28:47 UTC (rev 8447)
+++ packages/trunk/prboom/debian/patches/series	2008-11-23 23:24:40 UTC (rev 8448)
@@ -1,5 +1,4 @@
 windowed_mode.patch
 do_not_rebuild_prboom.wad.patch
 readme_customization.patch
-default_music_off.patch
 explain_no_iwad.patch