[oe-commits] Steffen Sledz : Revert "gypsy: fix packaging of DBus starter script"

[git at git.openembedded.org]

Module: openembedded.git
Branch: sledz/maintenance
Commit: 77a5200f2f7405368be243579c77947f4bae5f22
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=77a5200f2f7405368be243579c77947f4bae5f22

Author: Steffen Sledz <sledz at dresearch-fe.de>
Date:   Wed Nov 30 09:24:02 2011 +0100

Revert "gypsy: fix packaging of DBus starter script"

This reverts commit 9bef3779d181bdaef6ca90f4a7d86ab5ec2f2024.

---

 recipes/gypsy/gypsy.inc    |    4 +---
 recipes/gypsy/gypsy_0.7.bb |    2 --
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc
index 964e336..eab062c 100644
--- a/recipes/gypsy/gypsy.inc
+++ b/recipes/gypsy/gypsy.inc
@@ -3,8 +3,6 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native"
 
-INC_PR = "r1"
-
 inherit autotools pkgconfig
 
 do_configure_prepend () {
@@ -16,6 +14,6 @@ PACKAGES += "libgypsy libgypsy-dev libgypsy-dbg"
 FILES_lib${PN} = "${libdir}/lib*.so*"
 FILES_lib${PN}-dev = "${includedir}/* ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
 FILES_lib${PN}-dbg = "${libdir}/.debug"
-FILES_${PN} = "${datadir}/dbus-1/system-services/* ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
+FILES_${PN} = "${datadir}/dbus-1/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*"
 FILES_${PN}-dbg ="${libexecdir}/.debug*"
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.d/Gypsy.conf"
diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb
index 054c784..8cd8760 100644
--- a/recipes/gypsy/gypsy_0.7.bb
+++ b/recipes/gypsy/gypsy_0.7.bb
@@ -1,7 +1,5 @@
 require gypsy.inc
 
-PR = "${INC_PR}.0"
-
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \
            file://docs-reference-am.patch \
            file://remove-werror.patch \