SECTION = "x11/base"
LICENSE = "GPL"
DEPENDS = "apmd virtual/xserver libxext virtual/libx11 libxau xscrnsaverh libxss"
-DISTRO_apm ?= "apm"
-RDEPENDS = "${DISTRO_apm}"
-PR = "r7"
+RDEPENDS = "apm"
+PR = "r6"
inherit gpe pkgconfig
DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application based on Gtk+"
LICENSE = "GPLv2"
SECTION = "x11/panels"
-
-DISTRO_apm ?= "apm"
DEPENDS = "gtk+ startup-notification dbus dbus-glib matchbox-panel-2-icon-themes"
DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
-DEPENDS += " ${@base_contains("MACHINE_FEATURES", "${DISTRO_apm}", "apmd", "",d)}"
+DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
RDEPENDS_${PN} = "matchbox-panel-2-icon-theme"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PV = "2.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r0"
inherit autotools_stage pkgconfig
DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
SECTION = "openmoko/daemons"
-
-DISTRO_apm ?= "apm"
DEPENDS = "gtk+ pulseaudio apmd"
-RDEPENDS = "gpe-scap xrandr alsa-utils-amixer ${DISTRO_apm} dbus"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus"
PV = "0.1.0+svnr${SRCPV}"
-PR = "r7"
+PR = "r6"
inherit openmoko2 gconf
DESCRIPTION = "Suspend feature for the application launcher menu."
LICENSE = "GPL"
-PR = "r2"
+PR = "r1"
-DISTRO-apm ?= "apm"
RDEPENDS = "gpe-conf"
-RRECOMMENDS = "${DISTRO_apm}"
+RRECOMMENDS = "apm"
PACKAGES = "${PN}"
PACKAGE_ARCH = "all"
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r87"
+PR = "r86"
inherit task
#
DISTRO_SSH_DAEMON ?= "dropbear"
-# Distro can override apm provider
-DISTRO_apm ?= "apm"
-
#
# bluetooth manager
#
acpid"
RDEPENDS_task-base-apm = "\
- "${DISTRO_apm}" \
+ apm \
apmd \
${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"