diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-01-24 17:02:51 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-01-24 17:02:51 +0000 |
| commit | f68ff6a19d85b3f7dd8f2cfd72840e340fa0b328 (patch) | |
| tree | a0f7c7179b4b75f91ecefbcf6273d0078a5e378a /packages/dbus | |
| parent | ca2dd4565504ad3239ca73c5cf23c234d57a71b8 (diff) | |
| parent | 62d4698b651ec93b84dcb2f04fffdbd2b420f103 (diff) | |
merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
and 'c0a3e474625678b13727e12b833983f6e3389de1'
Diffstat (limited to 'packages/dbus')
| -rw-r--r-- | packages/dbus/dbus.inc | 11 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.2.bb | 2 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.1.1.bb | 2 |
4 files changed, 9 insertions, 8 deletions
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 \ |