summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-11-28 12:20:18 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-11-28 12:20:18 +0000
commit7f3ba086ff54c067c83e7672feed7523d04837a3 (patch)
treebe04166fe05548b521197d0b8d1f9e5c690a805d /meta
parent337406cc077a53127903f9b6ff763856a663c7f2 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/28 03:29:12+01:00 uni-frankfurt.de!mickeyl make zbedic 0.9.2-cvs compile 2004/11/28 02:35:32+01:00 uni-frankfurt.de!mickeyl wellenreiter: ensure the kernel's wireless.h gets picked up 2004/11/28 02:08:52+01:00 uni-frankfurt.de!mickeyl networkapplet: ensure the kernel's wireless.h gets picked up 2004/11/28 02:08:28+01:00 uni-frankfurt.de!mickeyl wirelessapplet: ensure the kernel's wireless.h gets picked up 2004/11/28 01:13:16+01:00 uni-frankfurt.de!mickeyl ship libopiobex0 in opie-image 2004/11/28 00:02:56+01:00 uni-frankfurt.de!mickeyl make opie-networksettings pick up the kernel's wireless.h 2004/11/27 23:51:12+01:00 uni-frankfurt.de!mickeyl make libopie pick up the kernel's wireless.h 2004/11/27 18:53:59+01:00 uni-frankfurt.de!mickeyl make wireless-tools pick up the kernel's wireless.h BKrev: 41a9c282CzUBHaxVZPfCILOfAoitvw
Diffstat (limited to 'meta')
-rw-r--r--meta/opie-collections.inc2
-rw-r--r--meta/opie-image.oe2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/opie-collections.inc b/meta/opie-collections.inc
index 159d8cea2e..11da680940 100644
--- a/meta/opie-collections.inc
+++ b/meta/opie-collections.inc
@@ -37,7 +37,7 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh opie-style-metal opie-style-web opie-style-phase"
-OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps"
+OPIE_BASE_DEPENDS = "ipkg ntp bluez-utils-nodbus irda-utils openobex-apps libopieobex0"
OPIE_BASE_RDEPENDS = "ntpdate opie-handwriting-classicset bluez-utils-nodbus openobex-apps libopieobex0"
#
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 6d97e43d7a..1043dd7ed3 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -4,7 +4,7 @@ export IMAGE_LINGUAS = ""
FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/3.5.2/feed/opie"
FEED_URIS_append_familiar = " opie##http://familiar.handhelds.org/releases/0.8/feed/opie"
-PR = "r6"
+PR = "r7"
include opie-collections.inc