[Pkg-sdl-commits] [SCM] Debian packaging of SDL2_mixer branch, master, updated. debian/2.0.0_rc1-1-6-g1969aab

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 62ac3cc9842b2ae3d5daba1316f04f3f9207f2a1
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jun 8 17:35:25 2013 +0100

    Applied upstream: http://hg.libsdl.org/SDL_mixer/rev/c932750a78ce

diff --git a/debian/patches/04_timidity_cfg_opts.patch b/debian/patches/04_timidity_cfg_opts.patch
deleted file mode 100644
index 0d58111..0000000
--- a/debian/patches/04_timidity_cfg_opts.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ignore unknown options in timidity.cfg
- Introduced in 1.2.8-6 (Fri, 22 May 2009 10:33:13 -0400).
-Author: Brandon Barnes <winterknight at nerdshack.com>
-Last-Update: 2012-01-20
-Bug-Debian: http://bugs.debian.org/398805
---- a/timidity/timidity.c
-+++ b/timidity/timidity.c
-@@ -153,7 +153,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)
diff --git a/debian/patches/series b/debian/patches/series
index b38c15c..a02a785 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
 #
 # 01_no_lvorbis_logg.patch
 # 02_hurd.patch
-# 04_timidity_cfg_opts.patch
 # bug-688369-double_free_crash.patch

-- 
Debian packaging of SDL2_mixer