From 74de793dc291035cd3cd5dc81e35ed4b8efc810c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Mon, 18 Feb 2008 18:01:49 +0000
Subject: matchbox-panel: update to latest srcrev, with new icons and new
 applets

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3825 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/distro/poky.conf                             | 2 +-
 meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'meta')

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index beeceda31..029d4dac6 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -94,7 +94,7 @@ SRCREV_pn-matchbox-desktop ?= "1902"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-panel ?= "1364"
 SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCREV_pn-matchbox-panel-2 ?= "1911"
+SRCREV_pn-matchbox-panel-2 ?= "1930"
 SRCREV_pn-matchbox-stroke ?= "1524"
 SRCREV_pn-matchbox-themes-extra ?= "1524"
 SRCREV_pn-matchbox-terminal ?= "1612"
diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
index 97e5980ff..03504143d 100644
--- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 PRIORITY = "optional"
-DEPENDS = "gtk+ startup-notification apmd"
+DEPENDS = "gtk+ startup-notification apmd dbus"
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 RPROVIDES_${PN} = "matchbox-panel"
 RREPLACES_${PN} = "matchbox-panel"
@@ -10,12 +10,11 @@ RCONFLICTS_${PN} = "matchbox-panel"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
-EXTRA_OECONF = "--enable-startup-notification --disable-libnotify"
+EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += "${libdir}/matchbox-panel/*.so \
-                ${datadir}/matchbox-panel/battery/*.png \
                 ${datadir}/matchbox-panel/brightness/*.png \
                 ${datadir}/matchbox-panel/startup/*.png "
 FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
-- 
cgit v1.2.3