[SCM] yoshimi packaging branch, master, updated. debian/0.058-1-5-g7a40117

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7a40117dc4e34c95376e131fa785701b43df0913
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 12 13:00:17 2010 +0200

    Add patch to make yoshimi stores user settings under ~/.config/yoshimi.

diff --git a/debian/patches/02-userconfig_path.patch b/debian/patches/02-userconfig_path.patch
new file mode 100644
index 0000000..1f068ae
--- /dev/null
+++ b/debian/patches/02-userconfig_path.patch
@@ -0,0 +1,49 @@
+Author: Alessio Treglia <alessio at debian.org>
+Description: Store user settings under ${HOME}/.config as
+ Freedesktop.org's per-spec.
+ http://www.freedesktop.org/wiki/Software/xdg-user-dirs
+Forwarded: no
+---
+ src/Misc/Config.cpp |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- yoshimi.orig/src/Misc/Config.cpp
++++ yoshimi/src/Misc/Config.cpp
+@@ -67,16 +67,16 @@ static struct argp_option cmd_options[]
+     {"autostart-jack",  'k',  NULL,         0,  "auto start jack server" },
+     {"auto-connect",    'K',  NULL,         0,  "auto connect jack audio" },
+     {"state",           'S',  "<file>",   0x1,
+-        "load state from <file>, defaults to '$HOME/.yoshimi/yoshimi.state'" },
++        "load state from <file>, defaults to '$HOME/.config/yoshimi/yoshimi.state'" },
+     { 0, }
+ };
+ 
+ 
+ 
+ Config::Config() :
+-    ConfigFile(string(getenv("HOME")) + string("/.yoshimiXML.cfg")),
++    ConfigFile(string(getenv("HOME")) + string("/.config/yoshimi/yoshimiXML.cfg")),
+     restoreState(false),
+-    StateFile(string(getenv("HOME")) + string("/.yoshimi/yoshimi.state")),
++    StateFile(string(getenv("HOME")) + string("/.config/yoshimi/yoshimi.state")),
+     Samplerate(48000),
+     Buffersize(128),
+     Oscilsize(1024),
+@@ -304,7 +304,7 @@ bool Config::loadConfigData(XMLwrapper *
+             "/usr/local/share/yoshimi/banks",
+             "/usr/share/zynaddsubfx/banks",
+             "/usr/local/share/zynaddsubfx/banks",
+-            string(getenv("HOME")) + "/banks",
++            string(getenv("HOME")) + "/.config/yoshimi/banks",
+             "../banks",
+             "banks"
+         };
+@@ -337,7 +337,7 @@ bool Config::loadConfigData(XMLwrapper *
+             "/usr/local/share/yoshimi/presets",
+             "/usr/share/zynaddsubfx/presets",
+             "/usr/local/share/zynaddsubfx/presets",
+-            string(getenv("HOME")) + "/presets",
++            string(getenv("HOME")) + "/.config/yoshimi/presets",
+             "../presets",
+             "presets"
+         };
diff --git a/debian/patches/series b/debian/patches/series
index ac0ed64..e0bfd59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-gcc_flags.patch
+02-userconfig_path.patch

-- 
yoshimi packaging