[oe-commits] Thomas Zimmermann : Revert "dbus-c++: add patch to fix the Makefile"

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9d8c3d675e16740bbc80406e643c1ef67d0e795c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9d8c3d675e16740bbc80406e643c1ef67d0e795c

Author: Thomas Zimmermann <ml at vdm-design.de>
Date:   Sat Jan 15 00:47:38 2011 +0100

Revert "dbus-c++: add patch to fix the Makefile"

This reverts commit c6daf0c9c3f5050bd31daf30e7eb2d9eecc8cf50.

---

 recipes/dbus/dbus-c++/fix-Makefile.patch |   11 -----------
 recipes/dbus/dbus-c++_git.bb             |    4 +---
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/recipes/dbus/dbus-c++/fix-Makefile.patch b/recipes/dbus/dbus-c++/fix-Makefile.patch
deleted file mode 100644
index 0724f32..0000000
--- a/recipes/dbus/dbus-c++/fix-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- git/src/Makefile.am	2011-01-14 23:36:44.000000000 +0100
-+++ git/src/Makefile.am	2011-01-14 23:36:44.000000000 +0100
-@@ -39,7 +39,7 @@
- 	$(HEADER_DIR)/pipe.h \
- 	$(GLIB_H) $(ECORE_H)
- 
--lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
-+lib_includedir=$(includedir)/dbus-c++/
- lib_include_HEADERS = $(HEADER_FILES)
- 
- lib_LTLIBRARIES = libdbus-c++-1.la
diff --git a/recipes/dbus/dbus-c++_git.bb b/recipes/dbus/dbus-c++_git.bb
index 246a631..07b4eec 100644
--- a/recipes/dbus/dbus-c++_git.bb
+++ b/recipes/dbus/dbus-c++_git.bb
@@ -6,10 +6,8 @@ SRCREV = "9e25833870ed8281fab00d7f9eac5755c6798c57"
 
 PE = "1"
 PV = "0.6.0-pre1+gitr${SRCPV}"
-PR = "r1"
 
-SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git \
-           file://fix-Makefile.patch"
+SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git"
 
 S = "${WORKDIR}/git"