[SCM] jack-mixer/master: Drop 0001-edit_channel_names.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5293f984c1fbb0356d92723685b3ce5d08a9e671
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 4 01:03:59 2014 +0100

    Drop 0001-edit_channel_names.patch, applied upstream.

diff --git a/debian/patches/0001-edit_channel_names.patch b/debian/patches/0001-edit_channel_names.patch
deleted file mode 100644
index bbdba71..0000000
--- a/debian/patches/0001-edit_channel_names.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Read the contents before destroying the dialog.
-Author: John Hedges <john at drystone.co.uk>
-Bug-Debian: http://bugs.debian.org/632357
-Bug: https://gna.org/bugs/index.php?18299
-Applied-Upstream: http://repo.or.cz/w/jack_mixer.git/commitdiff/3a682dd2
----
- channel.py |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- jack-mixer.orig/channel.py
-+++ jack-mixer/channel.py
-@@ -871,9 +871,8 @@ class ChannelPropertiesDialog(gtk.Dialog
- 
-     def on_response_cb(self, dlg, response_id, *args):
-         self.channel.channel_properties_dialog = None
--        self.destroy()
-+        name = self.entry_name.get_text()
-         if response_id == gtk.RESPONSE_APPLY:
--            name = self.entry_name.get_text()
-             self.channel.channel_name = name
-             try:
-                 self.channel.channel.volume_midi_cc = int(self.entry_volume_cc.get_text())
-@@ -883,6 +882,7 @@ class ChannelPropertiesDialog(gtk.Dialog
-                 self.channel.channel.balance_midi_cc = int(self.entry_balance_cc.get_text())
-             except ValueError:
-                 pass
-+        self.destroy()
- 
-     def on_entry_name_changed(self, entry):
-         sensitive = False
-@@ -933,9 +933,9 @@ class OutputChannelPropertiesDialog(Chan
-         self.display_solo_buttons.set_active(self.channel.display_solo_buttons)
- 
-     def on_response_cb(self, dlg, response_id, *args):
--        ChannelPropertiesDialog.on_response_cb(self, dlg, response_id, *args)
-         if response_id == gtk.RESPONSE_APPLY:
-             self.channel.display_solo_buttons = self.display_solo_buttons.get_active()
-+        ChannelPropertiesDialog.on_response_cb(self, dlg, response_id, *args)
- 
- 
- class NewOutputChannelDialog(OutputChannelPropertiesDialog):
diff --git a/debian/patches/series b/debian/patches/series
index 1c1ea07..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-edit_channel_names.patch

-- 
jack-mixer packaging