5 files changed, 9 insertions, 18 deletions
diff --git a/packages/dbus/dbus-python_0.71.bb b/packages/dbus/dbus-python_0.71.bb
deleted file mode 100644
index ed586b7f4b..0000000000
--- a/packages/dbus/dbus-python_0.71.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Message bus system for applications to talk to one another - python bindings"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "devel/python"
-DEPENDS = "python-pyrex-native dbus dbus-glib"
-PR = "r0"
-
-SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz"
-
-inherit distutils
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 21316c2d09..ecd3d18e70 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -19,7 +19,12 @@ INITSCRIPT_PARAMS = "defaults"
 
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
-FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+DEBIANNAME_${PN} = "dbus-1"
+
+PACKAGES += "${PN}-lib"
+
+FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
 pkg_postinst_dbus() {
@@ -60,7 +65,3 @@ do_install_append () {
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
 }
 
-python populate_packages_prepend () {
-	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-		bb.data.setVar('PKG_dbus', 'dbus-1', d)
-}
diff --git a/packages/dbus/dbus_1.0.1.bb b/packages/dbus/dbus_1.0.1.bb
index f5e4aa16ea..edc4f11a48 100644
--- a/packages/dbus/dbus_1.0.1.bb
+++ b/packages/dbus/dbus_1.0.1.bb
@@ -2,4 +2,4 @@ require dbus.inc
 
 SRC_URI += "file://dbus-exploit-fix.patch;patch=1"
 
-PR = "r4"
+PR = "r5"
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
index f51265e434..ec5052e342 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -2,7 +2,7 @@ require dbus.inc
 
 DEFAULT_PREFERENCE = "1"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \
diff --git a/packages/dbus/dbus_1.1.1.bb b/packages/dbus/dbus_1.1.1.bb
index 7bf0a8634d..07d2e5dd6c 100644
--- a/packages/dbus/dbus_1.1.1.bb
+++ b/packages/dbus/dbus_1.1.1.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://tmpdir.patch;patch=1 \