[SCM] fluidsynth/master: Revert ABI break introduced with FluidSynth 1.1.4.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8fb5e29a8b9e5dafdceb6480cb51a52196646493
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Aug 13 11:19:39 2011 +0200

    Revert ABI break introduced with FluidSynth 1.1.4.
    
     - This is now binary compatible with FluidSynth << 1.1.4,
       patch taken from upstream trunk.

diff --git a/debian/patches/1001-revert_abi_break_114.patch b/debian/patches/1001-revert_abi_break_114.patch
new file mode 100644
index 0000000..1dcd35d
--- /dev/null
+++ b/debian/patches/1001-revert_abi_break_114.patch
@@ -0,0 +1,32 @@
+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(-)
+
+--- 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_
+ int fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont);
+ int fluid_defsfont_add_sample(fluid_defsfont_t* sfont, fluid_sample_t* sample);
+ int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset);
+-
++fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s);
+ 
+ /*
+  * fluid_preset_t
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bf95dad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001-revert_abi_break_114.patch

-- 
fluidsynth packaging