[Pkg-sdl-commits] r211 - in unstable/sdl-mixer1.2/debian: . patches

Barry deFreese bdefreese at alioth.debian.org
Fri May 22 03:05:40 UTC 2009 

Author: bdefreese
Date: 2009-05-22 15:05:40 +0000 (Fri, 22 May 2009)
New Revision: 211

Added:
   unstable/sdl-mixer1.2/debian/patches/04_timidity_cfg_opts.diff
   unstable/sdl-mixer1.2/debian/patches/05_fallback_to_freepats.diff
Modified:
   unstable/sdl-mixer1.2/debian/changelog
   unstable/sdl-mixer1.2/debian/compat
   unstable/sdl-mixer1.2/debian/control
   unstable/sdl-mixer1.2/debian/patches/series
   unstable/sdl-mixer1.2/debian/rules
Log:
  * Add myself to uploaders.
  * 04_timidity_cfg_opts.diff - (Closes: #398805).
    + Ignore unknown options in timidity.cfg.
    + Thanks to Brandon Barnes for the patch.
  * 05_fallback_to_freepats.diff - (Closes: #453308).
    + Use freepats config if timidity isn't present.
    + Thanks to Fabian Greffrath for the patch.
  * Bump debhelper build-dep and compat to 5.
  * Bump Standards Version to 3.8.1.
    + Move Homepage from package description to source stanza.


Modified: unstable/sdl-mixer1.2/debian/changelog
===================================================================
--- unstable/sdl-mixer1.2/debian/changelog	2009-04-30 19:14:39 UTC (rev 210)
+++ unstable/sdl-mixer1.2/debian/changelog	2009-05-22 15:05:40 UTC (rev 211)
@@ -1,3 +1,19 @@
+sdl-mixer1.2 (1.2.8-6) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Add myself to uploaders.
+  * 04_timidity_cfg_opts.diff - (Closes: #398805).
+    + Ignore unknown options in timidity.cfg.
+    + Thanks to Brandon Barnes for the patch.
+  * 05_fallback_to_freepats.diff - (Closes: #453308).
+    + Use freepats config if timidity isn't present.
+    + Thanks to Fabian Greffrath for the patch.
+  * Bump debhelper build-dep and compat to 5.
+  * Bump Standards Version to 3.8.1.
+    + Move Homepage from package description to source stanza.
+
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 22 May 2009 10:33:13 -0400
+
 sdl-mixer1.2 (1.2.8-5) unstable; urgency=low
 
   * debian/README.source:

Modified: unstable/sdl-mixer1.2/debian/compat
===================================================================
--- unstable/sdl-mixer1.2/debian/compat	2009-04-30 19:14:39 UTC (rev 210)
+++ unstable/sdl-mixer1.2/debian/compat	2009-05-22 15:05:40 UTC (rev 211)
@@ -1 +1 @@
-4
+5

Modified: unstable/sdl-mixer1.2/debian/control
===================================================================
--- unstable/sdl-mixer1.2/debian/control	2009-04-30 19:14:39 UTC (rev 210)
+++ unstable/sdl-mixer1.2/debian/control	2009-05-22 15:05:40 UTC (rev 211)
@@ -2,9 +2,10 @@
 Section: libs
 Priority: optional
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4.1), quilt, libtool, libsdl1.2-dev (>= 1.2.4), libogg-dev, libvorbis-dev (>= 1.0.0-3), libsmpeg-dev (>= 0.4.5+cvs20030824-1.3), libmikmod-dev
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>, Barry deFreese <bdefreese at debian.org>
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5.0), quilt, libtool, libsdl1.2-dev (>= 1.2.4), libogg-dev, libvorbis-dev (>= 1.0.0-3), libsmpeg-dev (>= 0.4.5+cvs20030824-1.3), libmikmod-dev
+Homepage: http://www.libsdl.org/projects/SDL_mixer/
 
 Package: libsdl-mixer1.2
 Architecture: any
@@ -14,8 +15,6 @@
  SDL Mixer is a sample multi-channel audio mixer library.  It supports 4
  channels of 16 bit stereo audio, plus a single channel of music, mixed by
  the popular MikMod MOD, Timidity MIDI, and SMPEG MP3 libraries.
- .
- URL: http://www.libsdl.org/projects/SDL_mixer/
 
 Package: libsdl-mixer1.2-dev
 Architecture: any
@@ -29,5 +28,3 @@
  .
  This package contains files needed if you wish to use the SDL mixer
  library in your own programs.
- .
- URL: http://www.libsdl.org/projects/SDL_mixer/

Added: unstable/sdl-mixer1.2/debian/patches/04_timidity_cfg_opts.diff
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/04_timidity_cfg_opts.diff	                        (rev 0)
+++ unstable/sdl-mixer1.2/debian/patches/04_timidity_cfg_opts.diff	2009-05-22 15:05:40 UTC (rev 211)
@@ -0,0 +1,13 @@
+Index: sdl-mixer1.2-1.2.8/timidity/timidity.c
+===================================================================
+--- sdl-mixer1.2-1.2.8.orig/timidity/timidity.c	2009-05-22 10:23:25.000000000 -0400
++++ sdl-mixer1.2-1.2.8/timidity/timidity.c	2009-05-22 10:26:12.000000000 -0400
+@@ -165,7 +165,7 @@
+     {
+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+         "%s: line %d: syntax error\n", name, line);
+-     return -2;
++     continue;
+     }
+   i=atoi(w[0]);
+   if (i<0 || i>127)

Added: unstable/sdl-mixer1.2/debian/patches/05_fallback_to_freepats.diff
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/05_fallback_to_freepats.diff	                        (rev 0)
+++ unstable/sdl-mixer1.2/debian/patches/05_fallback_to_freepats.diff	2009-05-22 15:05:40 UTC (rev 211)
@@ -0,0 +1,27 @@
+Index: sdl-mixer1.2-1.2.8/timidity/config.h
+===================================================================
+--- sdl-mixer1.2-1.2.8.orig/timidity/config.h	2009-05-22 10:27:41.000000000 -0400
++++ sdl-mixer1.2-1.2.8/timidity/config.h	2009-05-22 10:28:14.000000000 -0400
+@@ -172,6 +172,7 @@
+ #define CONFIG_FILE	"timidity.cfg"
+ #define CONFIG_FILE_ETC "/etc/timidity.cfg"
+ #define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
++#define CONFIG_FILE_ETC_TIMIDITY_FREEPATS "/etc/timidity/freepats.cfg"
+ 
+ #if defined(__WIN32__) || defined(__OS2__)
+ #define DEFAULT_PATH	"\\TIMIDITY"
+Index: sdl-mixer1.2-1.2.8/timidity/timidity.c
+===================================================================
+--- sdl-mixer1.2-1.2.8.orig/timidity/timidity.c	2009-05-22 10:29:25.000000000 -0400
++++ sdl-mixer1.2-1.2.8/timidity/timidity.c	2009-05-22 10:31:53.000000000 -0400
+@@ -297,7 +297,9 @@
+   if (read_config_file(CONFIG_FILE)<0) {
+     if (read_config_file(CONFIG_FILE_ETC)<0) {
+       if (read_config_file(CONFIG_FILE_ETC_TIMIDITY)<0) {
+-        return(-1);
++        if (read_config_file(CONFIG_FILE_ETC_TIMIDITY_FREEPATS)<0) {
++          return(-1);
++        }
+       }
+     }
+   }

Modified: unstable/sdl-mixer1.2/debian/patches/series
===================================================================
--- unstable/sdl-mixer1.2/debian/patches/series	2009-04-30 19:14:39 UTC (rev 210)
+++ unstable/sdl-mixer1.2/debian/patches/series	2009-05-22 15:05:40 UTC (rev 211)
@@ -7,3 +7,5 @@
 200_channel_segfaults.diff
 210_dev_snd_seq.diff
 220_mixer_segfaults.diff
+04_timidity_cfg_opts.diff
+05_fallback_to_freepats.diff

Modified: unstable/sdl-mixer1.2/debian/rules
===================================================================
--- unstable/sdl-mixer1.2/debian/rules	2009-04-30 19:14:39 UTC (rev 210)
+++ unstable/sdl-mixer1.2/debian/rules	2009-05-22 15:05:40 UTC (rev 211)
@@ -37,6 +37,7 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -f build-stamp configure-stamp
+	rm -rf .pc
 	dh_clean
 
 install: build

More information about the pkg-sdl-commits mailing list