[SCM] jack-rack/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f4cca9029d643788c871670f046ad454fb3c2ee3
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 29 11:12:26 2011 +0200

    Refresh patches.

diff --git a/debian/patches/01-desktop_file.patch b/debian/patches/01-desktop_file.patch
index 6a6d8c2..3baf1d3 100644
--- a/debian/patches/01-desktop_file.patch
+++ b/debian/patches/01-desktop_file.patch
@@ -1,19 +1,16 @@
 Author: Alessio Treglia <quadrispro at ubuntu.com>
 Description: Fix desktop file as Freedesktop.org's per spec.
+Forwarded: torbenh at gmx.de, leslie.polzer at gmx.net,
+ adamsampson at users.sourceforge.net
 ---
- jack-rack.desktop |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ jack-rack.desktop |    1 -
+ 1 file changed, 1 deletion(-)
 
 --- jack-rack.orig/jack-rack.desktop
 +++ jack-rack/jack-rack.desktop
-@@ -1,9 +1,8 @@
+@@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=JACK Rack
  Comment=Stereo LADSPA effects rack
- Exec=jack-rack
--Icon=jack-rack-icon.png
-+Icon=jack-rack-icon
- Terminal=false
- Type=Application
- Categories=GNOME;Application;AudioVideo;
+ Comment[ru]=Стойка эффектов LADSPA
diff --git a/debian/patches/02-gcc45_binutils_gold.patch b/debian/patches/02-gcc45_binutils_gold.patch
index 1ee6e34..1a0acc7 100644
--- a/debian/patches/02-gcc45_binutils_gold.patch
+++ b/debian/patches/02-gcc45_binutils_gold.patch
@@ -1,23 +1,12 @@
 Description: Fix FTBFS with newest GCC4.5 and linker.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: https://sourceforge.net/apps/trac/jack-rack/ticket/1
+ Also forwarded to torbenh at gmx.de, leslie.polzer at gmx.net,
+ adamsampson at users.sourceforge.net
 ---
  src/Makefile.am |    3 ++-
- src/Makefile.in |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
---- jack-rack.orig/src/Makefile.in
-+++ jack-rack/src/Makefile.in
-@@ -268,7 +268,8 @@ jack_rack_CFLAGS = \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
- 	-DGNOME_DISABLE_DEPRECATED=1
- 
--jack_rack_LDFLAGS = \
-+LIBS = \
-+	-ldl \
- 	$(JACK_LIBS) \
- 	$(GTK_LIBS) \
- 	$(GNOMEUI_LIBS) \
 --- jack-rack.orig/src/Makefile.am
 +++ jack-rack/src/Makefile.am
 @@ -61,7 +61,8 @@ jack_rack_CFLAGS = \
diff --git a/debian/patches/03-remove_midi_when_replacing_plugin.patch b/debian/patches/03-remove_midi_when_replacing_plugin.patch
index c6af3b0..3fcd928 100644
--- a/debian/patches/03-remove_midi_when_replacing_plugin.patch
+++ b/debian/patches/03-remove_midi_when_replacing_plugin.patch
@@ -6,14 +6,14 @@ Origin: upstream, commit:798294e5a907fdccc9844494ac1be9750d09a146
 
 --- jack-rack.orig/src/plugin_slot.c
 +++ jack-rack/src/plugin_slot.c
-@@ -558,6 +558,10 @@ plugin_slot_change_plugin (plugin_slot_t
+@@ -557,6 +557,10 @@ plugin_slot_change_plugin (plugin_slot_t
+       plugin_slot->lock_all = NULL;
      }
  
- 
 +#ifdef HAVE_ALSA
 +  /* remove controls for this plugin */
 +  plugin_slot_remove_midi_controls (plugin_slot);
 +#endif
  
-   /* kill all the control stuff */
-   if (plugin_slot->control_table)
+ #ifdef HAVE_ALSA
+   /* remove controls for this plugin */

-- 
jack-rack packaging