diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-03-12 13:53:35 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-03-12 13:53:35 +0000 |
| commit | 8e41ef287bbef80f218acdbdc91e22c3afd21d18 (patch) | |
| tree | 304615908abe2d3782d1d136e5b1d8a402f1a50f | |
| parent | 5e1b6608d22c74bc5cbbac779e7d03b563ca84c6 (diff) | |
| parent | 4e53d5c5c59b04fea1efc15627d9bde8317d09ec (diff) | |
merge of '6c22fef7b920ae43c2fbce7a9e19083391b1a445'
and '87d12e6784859dc88ead3df8e50d97340f10b881'
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | conf/distro/foonas.conf | 2 | ||||
| -rw-r--r-- | packages/opie-multikey/opie-multikey.inc | 1 | ||||
| -rw-r--r-- | packages/opie-multikey/opie-multikey_1.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/opie-multikey/opie-multikey_cvs.bb | 2 |
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" |