From ac5ff724b6af1e90803b14f4a4b9441211d7b0c5 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Jul 2012 15:15:09 +0100 Subject: gypsy: inherit gtk-doc (From OE-Core rev: 5caa2b521ed82cc1a223eddc59450ce68bbb3962) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/gypsy/gypsy.inc | 6 +----- meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +- meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc index 11a72046fe..0c1735e1b4 100644 --- a/meta/recipes-connectivity/gypsy/gypsy.inc +++ b/meta/recipes-connectivity/gypsy/gypsy.inc @@ -8,12 +8,8 @@ LICENSE = "GPLv2.0 & LGPLv2.1" SECTION = "x11" DEPENDS = "glib-2.0 dbus bluez4 dbus-glib" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc EXTRA_OECONF += "--with-distro=debian" -do_configure_prepend () { - touch ${S}/gtk-doc.make -} - FILES_${PN} += "/usr/share/dbus-1/services/" diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb index 59a34fa66d..e7018383ea 100644 --- a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb +++ b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb @@ -16,7 +16,7 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt" SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \ file://fix-unused-but-set-variable-warning.patch \ " -PR = "r2" +PR = "r3" inherit autotools pkgconfig diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb index b123e11816..495467e146 100644 --- a/meta/recipes-connectivity/gypsy/gypsy_git.bb +++ b/meta/recipes-connectivity/gypsy/gypsy_git.bb @@ -4,6 +4,8 @@ DEFAULT_PREFERENCE = "-1" SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5" PV = "0.8+git${SRCPV}" +PR = "r1" + S = "${WORKDIR}/git" LICENSE = "GPLv2+ & LGPLv2+" -- cgit v1.2.3-54-g00ecf