[SCM] fluidsynth/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8fa89a7be42e304597b78e235e77c0a57f3b5015
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 5 12:13:58 2011 +0200

    Refresh

diff --git a/debian/patches/1001-revert_abi_break_114.patch b/debian/patches/1001-revert_abi_break_114.patch
index 1dcd35d..b2e4c85 100644
--- a/debian/patches/1001-revert_abi_break_114.patch
+++ b/debian/patches/1001-revert_abi_break_114.patch
@@ -1,24 +1,9 @@
 Description: Revert ABI break introduced with FluidSynth 1.1.4.
 Origin: upstream, commit:428
 ---
- src/sfloader/fluid_defsfont.c |    5 +++++
  src/sfloader/fluid_defsfont.h |    2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- fluidsynth.orig/src/sfloader/fluid_defsfont.c
-+++ fluidsynth/src/sfloader/fluid_defsfont.c
-@@ -109,6 +109,11 @@ char* fluid_defsfont_sfont_get_name(flui
-   return fluid_defsfont_get_name((fluid_defsfont_t*) sfont->data);
- }
- 
-+fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s)
-+{
-+  return NULL;
-+}
-+
- fluid_preset_t*
- fluid_defsfont_sfont_get_preset(fluid_sfont_t* sfont, unsigned int bank, unsigned int prenum)
- {
 --- fluidsynth.orig/src/sfloader/fluid_defsfont.h
 +++ fluidsynth/src/sfloader/fluid_defsfont.h
 @@ -421,7 +421,7 @@ int fluid_defsfont_iteration_next(fluid_

-- 
fluidsynth packaging