[SCM] ladish/master: Use ladi-control-center by default instead of the obsolete ladiconf.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 75496f3535ff654d7414b0593cfd7e987d4d5580
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed May 16 19:41:46 2012 +0200

    Use ladi-control-center by default instead of the obsolete ladiconf.
    
    Closes: #671360

diff --git a/debian/patches/0002-new_laditools.patch b/debian/patches/0002-new_laditools.patch
new file mode 100644
index 0000000..09eab6a
--- /dev/null
+++ b/debian/patches/0002-new_laditools.patch
@@ -0,0 +1,18 @@
+Description: Use laditools' new ladi-control-center instead of ladiconf.
+Author: Alessio Treglia <alessio at debian.org>
+Applied-Upstream:http://repo.or.cz/w/ladish.git/commitdiff/466d958b8
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671360 
+---
+ dbus_constants.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- ladish.orig/dbus_constants.h
++++ ladish/dbus_constants.h
+@@ -95,6 +95,6 @@
+ #define LADISH_DBUS_ERROR_KEY_NOT_FOUND       DBUS_NAME_BASE ".Error.KeyNotFound"
+ 
+ #define LADISH_CONF_KEY_JACK_CONF_TOOL            "/org/ladish/jack_conf_tool"
+-#define LADISH_CONF_KEY_JACK_CONF_TOOL_DEFAULT    "ladiconf"
++#define LADISH_CONF_KEY_JACK_CONF_TOOL_DEFAULT    "ladi-control-center"
+ 
+ #endif /* #ifndef DBUS_CONSTANTS_H__C21DE0EE_C19C_42F0_8D63_D613E4806C0E__INCLUDED */
diff --git a/debian/patches/series b/debian/patches/series
index 55ca7cd..f4db4ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 2001-xterminal_emulator_instead_of_xterm.patch
 2002-liblash_soname.patch
 0001-misspelling.patch
+0002-new_laditools.patch

-- 
ladish packaging