| Submitter | Steffen Sledz |
|---|---|
| Date | Nov. 24, 2011, 2:47 p.m. |
| Message ID | <1322146025-21514-1-git-send-email-sledz@dresearch-fe.de> |
| Download | mbox | patch |
| Permalink | /patch/15407/ |
| State | Superseded |
| Headers | show |
Comments
Am Donnerstag, den 24.11.2011, 15:47 +0100 schrieb Steffen Sledz: > A wrong path had avoided the packaging of the dbus starter script > /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service. So why not use gypsy: fix packaging of DBus starter script as the commit summary? > Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> > --- > recipes/gypsy/gypsy.inc | 4 +++- > recipes/gypsy/gypsy_0.7.bb | 2 ++ > 2 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc > index eab062c..964e336 100644 > --- a/recipes/gypsy/gypsy.inc > +++ b/recipes/gypsy/gypsy.inc > @@ -3,6 +3,8 @@ LICENSE = "GPL" > SECTION = "x11" > DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" > > +INC_PR = "r1" > + > inherit autotools pkgconfig > > do_configure_prepend () { > @@ -14,6 +16,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/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*" > +FILES_${PN} = "${datadir}/dbus-1/system-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 8cd8760..a10cd6e 100644 > --- a/recipes/gypsy/gypsy_0.7.bb > +++ b/recipes/gypsy/gypsy_0.7.bb > @@ -1,5 +1,7 @@ > require gypsy.inc > > +PR = "${INC_PR}.1" > + Since `INC_PR` is increased, `${INC_PR}.0` should be fine. > SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \ > file://docs-reference-am.patch \ > file://remove-werror.patch \ With the changes above this recipe is Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> Thanks, Paul
This is the update patch set according to the annotations of Paul Menzel. Steffen Sledz (3): gypsy: fix packaging of DBus starter script gypsy: move generic SRC_URI part to gypsy.inc gypsy: update to latest upstream version 0.8, and remove version 0.7 recipes/gypsy/gypsy.inc | 6 +++++- recipes/gypsy/gypsy_0.7.bb | 10 ---------- recipes/gypsy/gypsy_0.8.bb | 6 ++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 recipes/gypsy/gypsy_0.7.bb create mode 100644 recipes/gypsy/gypsy_0.8.bb
Patch
diff --git a/recipes/gypsy/gypsy.inc b/recipes/gypsy/gypsy.inc index eab062c..964e336 100644 --- a/recipes/gypsy/gypsy.inc +++ b/recipes/gypsy/gypsy.inc @@ -3,6 +3,8 @@ LICENSE = "GPL" SECTION = "x11" DEPENDS = "glib-2.0 dbus-glib bluez4 libxslt-native" +INC_PR = "r1" + inherit autotools pkgconfig do_configure_prepend () { @@ -14,6 +16,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/services/ ${libexecdir}/gypsy-daemon ${sysconfdir}/dbus-1/system.d/*" +FILES_${PN} = "${datadir}/dbus-1/system-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 8cd8760..a10cd6e 100644 --- a/recipes/gypsy/gypsy_0.7.bb +++ b/recipes/gypsy/gypsy_0.7.bb @@ -1,5 +1,7 @@ require gypsy.inc +PR = "${INC_PR}.1" + SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \ file://docs-reference-am.patch \ file://remove-werror.patch \
A wrong path had avoided the packaging of the dbus starter script /usr/share/dbus-1/system-services/org.freedesktop.Gypsy.service. Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> --- recipes/gypsy/gypsy.inc | 4 +++- recipes/gypsy/gypsy_0.7.bb | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-)