Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/06/16 20:50:51+01:00 (none)!pb
apply patch from Alexander Yukhimets to fix automake problem with battery applet

BKrev: 40d0a4abcoW-xKCT9Tzgi65jlNCkrA

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 2d182d2..d708f19 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -33,6 +33,7 @@ mithro@mithis.com
 p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)
 pb@dixie.nexus.co.uk
+pb@stealth.(none)
 pb_@gandalf.tm.informatik.uni-frankfurt.de
 ral@alwin.at.home
 schurig@mnz66.mn-logistik.de

diff --git a/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch b/matchbox-panel/matchbox-panel-0.8.1/automake-lossage.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/matchbox-panel/matchbox-panel_0.8.1.oe b/matchbox-panel/matchbox-panel_0.8.1.oe
index db20855..0fa4e9b 100644 (file)
--- a/matchbox-panel/matchbox-panel_0.8.1.oe
+++ b/matchbox-panel/matchbox-panel_0.8.1.oe
@@ -1,8 +1,10 @@
+PR = "r1"
 DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xpm"
 
-SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
+       file://automake-lossage.patch;patch=1"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
 inherit autotools  pkgconfig