[SCM] earcandy/master: Fixed parsing of commands separated by semicolon from desktop files.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c3b0b70864f88f363b44e73bb25e4847dfc379bb
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 26 09:22:55 2010 +0200

    Fixed parsing of commands separated by semicolon from desktop files.

diff --git a/debian/patches/01-desktop_file_parsing.patch b/debian/patches/01-desktop_file_parsing.patch
new file mode 100644
index 0000000..f2e5aa4
--- /dev/null
+++ b/debian/patches/01-desktop_file_parsing.patch
@@ -0,0 +1,22 @@
+From: http://bazaar.launchpad.net/~phw/earcandy/fixes/revision/81
+Author: Philipp Wolfer
+Description: Fixed parsing of commands separated by semicolon from
+ desktop files.
+---
+ earcandy/util/Freedesktop.py |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- earcandy.orig/earcandy/util/Freedesktop.py
++++ earcandy/earcandy/util/Freedesktop.py
+@@ -85,7 +85,10 @@ class DesktopParser(ConfigParser):
+ 	def get_exec_array(self):
+ 		command = []
+ 		p = re.compile("('[^']+')|(\"[^\"]+\")|([^\s]+)")
+-		for r in re.finditer(p, self.get("Exec")):
++		cmd = self.get("Exec")
++		if isinstance(cmd, list):
++			cmd = "; ".join(cmd)
++		for r in re.finditer(p, cmd):
+ 			command.append( str(r.group(0)) )
+ 		return command
+ 			
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1d551d5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-desktop_file_parsing.patch

-- 
earcandy packaging