Merge oe-devel@oe-devel.bkbits.net:openembedded

into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/02/17 13:56:22+00:00 cambridgebroadband.com!rjt
add patches to make tosa battery management nicer

BKrev: 4214a31eCJ_rPm4m9JMObUuXsDN6vA

diff --git a/packages/gpe-conf/gpe-conf-0.1.22/battery_with_no_lifetime.patch b/packages/gpe-conf/gpe-conf-0.1.22/battery_with_no_lifetime.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gpe-conf/gpe-conf-0.1.22/ignore_invalid_battery_values.patch b/packages/gpe-conf/gpe-conf-0.1.22/ignore_invalid_battery_values.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gpe-conf/gpe-conf_0.1.22.bb b/packages/gpe-conf/gpe-conf_0.1.22.bb
index 0f4aa3b..3b7166c 100644 (file)
--- a/packages/gpe-conf/gpe-conf_0.1.22.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.22.bb
@@ -1,11 +1,13 @@
-PR = "r4"
+PR = "r6"
 LICENSE = "GPL"
 inherit gpe
 
 SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0 \
        file://desktop-categories.patch;patch=1 \
        file://fix-wificonfig.patch;patch=1;pnum=0 \
-       file://serial_tts.patch;patch=1"
+       file://serial_tts.patch;patch=1 \
+       file://battery_with_no_lifetime.patch;patch=1 \
+       file://ignore_invalid_battery_values.patch;patch=1"
 
 DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
 RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"

diff --git a/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch b/packages/matchbox-panel/matchbox-panel-0.9.1/allow-100-per-cent-battery.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch b/packages/matchbox-panel/matchbox-panel-0.9.1/no_time_support.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index a96962c..bf892db 100644 (file)
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -2,8 +2,11 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
+PR = "r1"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
+           file://allow-100-per-cent-battery.patch;patch=1 \
+          file://no_time_support.patch;patch=1"
 
 inherit autotools pkgconfig gettext