summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS6
-rw-r--r--conf/distro/foonas.conf2
-rw-r--r--packages/opie-multikey/opie-multikey.inc1
-rw-r--r--packages/opie-multikey/opie-multikey_1.2.2.bb2
-rw-r--r--packages/opie-multikey/opie-multikey_cvs.bb2
5 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 74c0281acb..fd221071d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -118,12 +118,12 @@ Recipes: mx31ads-kernel*
Person: Marcin Juszkiewicz
Mail: hrw@openembedded.org
Website: http://www.hrw.one.pl/
-Machines: collie, spitz, tosa, progear
+Machines: collie, tosa, progear
Distros: OpenZaurus, celinux-test
Interests: WiFi, Opie, Qtopia fonts, Native SDK
Recipes: linux, hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps
-Recipes: linux-rp, kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
-Recipes: ttf-fonts/* qpf-fonts/*
+Recipes: linux-rp, gammu
+Recipes: ttf-fonts/*
Person: Michael 'Mickey' Lauer
Mail: mlauer@vanille-media.de
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 6745d9d0ca..dc0a1a9cae 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -46,7 +46,7 @@ PREFERRED_PROVIDER_virtual/db-native = "db-native"
PREFERRED_VERSION_binutils = "2.16"
PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_gcc = "4.1.2"
+PREFERRED_VERSION_gcc = "4.1.1"
PREFERRED_VERSION_gcc-cross = "4.1.1"
PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
diff --git a/packages/opie-multikey/opie-multikey.inc b/packages/opie-multikey/opie-multikey.inc
index 40cc884715..e936072b4c 100644
--- a/packages/opie-multikey/opie-multikey.inc
+++ b/packages/opie-multikey/opie-multikey.inc
@@ -4,6 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "libqtaux2 opie-pickboard"
RDEPENDS = "opie-pics opie-pickboard"
+RRECOMMENDS = "opie-multikeyapplet"
APPNAME = "qmultikey"
S = "${WORKDIR}/multikey"
diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb
index 702dda05e9..9217992acc 100644
--- a/packages/opie-multikey/opie-multikey_1.2.2.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.2.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index fa74824d73..53d8db91b4 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
${HANDHELDS_CVS};module=opie/share"