diff options
| -rwxr-xr-x | contrib/mtnpatch.py | 54 | ||||
| -rw-r--r-- | packages/dbus/dbus-glib-native_0.71.bb | 3 |
2 files changed, 1 insertions, 56 deletions
diff --git a/contrib/mtnpatch.py b/contrib/mtnpatch.py deleted file mode 100755 index 73143dba69..0000000000 --- a/contrib/mtnpatch.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python -import sys, os, string, getopt, re - -mtncmd = "monotone" - -def main(argv = None): - if argv is None: - argv = sys.argv - opts, list = getopt.getopt(sys.argv[1:], ':R') - if len(list) < 1: - print "You must specify a file" - return 2 - reverse = False - for o, a in opts: - if o == "-R": - reverse = True - if os.path.exists(list[0]): - input = open(list[0], 'r') - renameFrom = "" - cmd = "" - if reverse: - print "patch -R -p0 < %s" % list[0] - else: - print "patch -p0 < %s" % list[0] - for line in input: - if len(line) > 0: - if line[0] == '#': - 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) - else: - print "%s drop -e %s" % (mtncmd, fileName) - elif cmd == "add_file": - if reverse: - print "%s drop -e %s" % (mtncmd, fileName) - else: - print "%s add %s" % (mtncmd, fileName) - elif cmd == "rename_file": - renameFrom = fileName - elif cmd == "to" and renameFrom != "": - if reverse: - print "%s rename -e %s %s" % (mtncmd, fileName, renameFrom) - else: - print "%s rename -e %s %s" % (mtncmd, renameFrom, fileName) - renameFrom = "" - else: - cmd = "" - -if __name__ == "__main__": - sys.exit(main()) diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb index 200a7133b2..1f5d71da91 100644 --- a/packages/dbus/dbus-glib-native_0.71.bb +++ b/packages/dbus/dbus-glib-native_0.71.bb @@ -3,7 +3,6 @@ PR = "r0" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ @@ -13,7 +12,7 @@ inherit autotools pkgconfig gettext native S = "${WORKDIR}/dbus-glib-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib" -DEPENDS = "glib-2.0-native" +DEPENDS = "glib-2.0-native dbus-native" do_stage() { oe_runmake install |