[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 9dfcaba8b372f0dd3a73e58fce93bb27f29402c0
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jun 8 17:34:42 2013 +0100

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

diff --git a/debian/patches/05_fallback_to_freepats.patch b/debian/patches/05_fallback_to_freepats.patch
deleted file mode 100644
index b44a2dc..0000000
--- a/debian/patches/05_fallback_to_freepats.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: If timidity.cfg is not present, please try to load freepats.cfg
- Introduced in 1.2.8-6 (Fri, 22 May 2009 10:33:13 -0400).
-Author: Fabian Greffrath <greffrath at leat.rub.de>
-Last-Update: 2012-01-20
-Bug-Debian: http://bugs.debian.org/453308
---- a/timidity/config.h
-+++ b/timidity/config.h
-@@ -162,6 +162,7 @@
-    then specify the library directory in the configuration file. */
- #define CONFIG_FILE	"timidity.cfg"
- #define CONFIG_FILE_ETC "/etc/timidity.cfg"
-+#define CONFIG_FILE_ETC_TIMIDITY_FREEPATS "/etc/timidity/freepats.cfg"
- 
- #if defined(__WIN32__) || defined(__OS2__)
- #define DEFAULT_PATH	"C:\\TIMIDITY"
---- a/timidity/timidity.c
-+++ b/timidity/timidity.c
-@@ -286,7 +286,9 @@
-   if (!env || read_config_file(env)<0) {
-     if (read_config_file(CONFIG_FILE)<0) {
-       if (read_config_file(CONFIG_FILE_ETC)<0) {
--        return(-1);
-+        if (read_config_file(CONFIG_FILE_ETC_TIMIDITY_FREEPATS)<0) {
-+          return(-1);
-+        }
-       }
-     }
-   }
diff --git a/debian/patches/series b/debian/patches/series
index dc0b34c..b38c15c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
 # 01_no_lvorbis_logg.patch
 # 02_hurd.patch
 # 04_timidity_cfg_opts.patch
-# 05_fallback_to_freepats.patch
 # bug-688369-double_free_crash.patch

-- 
Debian packaging of SDL2_mixer