mtnpatch: replace split with regex

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 9c49028..c258758 100644 (file)
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -44,6 +44,6 @@ do_stage_append () {
 }
 
 PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
+FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}"
 FILES_${PN}-examples = "${bindir} ${datadir}"
 

diff --git a/contrib/mtnpatch.py b/contrib/mtnpatch.py
old mode 100644 (file)
new mode 100755 (executable)
index 520ebfa..73143db
--- a/contrib/mtnpatch.py
+++ b/contrib/mtnpatch.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, os, string, getopt
+import sys, os, string, getopt, re
 
 mtncmd = "monotone"
 
@@ -25,14 +25,10 @@ def main(argv = None):
         for line in input:
             if len(line) > 0:
                 if line[0] == '#':
-                    parts = line.split()
-                    if len(parts) > 2:
-                        cmd = parts[1]
-                        # deal with whilespace in filenames (badly)
-                        fileName = parts[2]
-                        i = 3
-                        while i < len(parts) and fileName.count('"') % 2:
-                            fileName += " %s" % parts[i]
+                    matches = re.search("#\s+(\w+)\s+\"(.*)\"", line)
+                    if matches is not None:
+                        cmd = matches.group(1)
+                        fileName = matches.group(2)
                         if cmd == "delete_file":
                             if reverse:
                                 print "%s add %s" % (mtncmd, fileName)

diff --git a/packages/e17/e-utils_20060128.bb b/packages/e17/e-utils_20060128.bb
deleted file mode 100644 (file)
index 3f1af89..0000000
--- a/packages/e17/e-utils_20060128.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
-S = "${WORKDIR}/e_utils"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"

diff --git a/packages/e17/e-utils_20060501.bb b/packages/e17/e-utils_20060501.bb
new file mode 100644 (file)
index 0000000..3f1af89
--- /dev/null
+++ b/packages/e17/e-utils_20060501.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"