diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/angstrom/angstrom-gpe-task-base.bb | 5 | ||||
| -rw-r--r-- | recipes/gnome/gnome-bluetooth_2.27.3.bb | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/recipes/angstrom/angstrom-gpe-task-base.bb b/recipes/angstrom/angstrom-gpe-task-base.bb index 656180d4b3..f2c897dfb7 100644 --- a/recipes/angstrom/angstrom-gpe-task-base.bb +++ b/recipes/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r36" +PR = "r37" inherit task @@ -36,7 +36,6 @@ RDEPENDS_${PN} = "\ gdk-pixbuf-loader-jpeg \ pango-module-basic-x \ pango-module-basic-fc \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth", "",d)} \ " diff --git a/recipes/gnome/gnome-bluetooth_2.27.3.bb b/recipes/gnome/gnome-bluetooth_2.27.3.bb index 8fd8318a12..6954b819c8 100644 --- a/recipes/gnome/gnome-bluetooth_2.27.3.bb +++ b/recipes/gnome/gnome-bluetooth_2.27.3.bb @@ -3,15 +3,21 @@ SECTION = "x11/gnome" inherit autotools gnome pkgconfig -SRC_URI = "svn://svn.gnome.org/svn/${PN};module=tags/GNOMEBT_V_2_27_3;rev=596;proto=http" -S = "${WORKDIR}/tags/GNOMEBT_V_2_27_3" +GBTREV = "609" +SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk;rev=${GBTREV};proto=http" +S = "${WORKDIR}/trunk" +PV = "2.27.3+svnr${GBTREV}" DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" RRECOMMENDS_${PN} += "obexd obex-data-server" RCONFLICTS_${PN} = "bluez-gnome" +EXTRA_OECONF = "--enable-debug" +CFLAGS += " -g " + do_configure_prepend() { sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make echo "EXTRA_DIST = version.xml" > gtk-doc.make } |