summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
committerRod Whitby <rod@whitby.id.au>2005-01-14 14:06:37 +0000
commit182573fdba68b6fe20942ac93ded46909663e37b (patch)
treec841a01aff4ff23f46f47cb1f78bc17fffec1bac /conf/distro
parent4148cabf119303c0a6ceddd4d8c4ed2abb669cc9 (diff)
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/01/14 06:05:21-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/13 15:05:24-06:00 ti.com!kergoth Import '[PATCH] more trailing spaces and missing quotes' from Marc Singer. 2005/01/13 15:02:51-06:00 ti.com!kergoth Add a /etc/network/interfaces file for coLinux. 2005/01/13 13:24:50-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 13:24:42-06:00 ti.com!kergoth Fix btxml and devmem2 to stop working around the do_unpack bug I just fixed. 2005/01/13 18:33:04+00:00 cambridgebroadband.com!rjt Merge oe-devel@oe-devel.bkbits.net:openembedded into flotta.cambridgebroadband.com:/development/openembedded/openembedded 2005/01/13 13:14:19-06:00 ti.com!kergoth Add lemon, an LALR(1) parser generator. 2005/01/13 13:09:04-06:00 ti.com!kergoth BUGFIX in do_unpack: only create a relative directory structure in WORKDIR when unpacking using cp if the type is file:// (FILESPATH handling). 2005/01/13 12:30:36-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/13 18:29:26+00:00 cambridgebroadband.com!rjt update PR on openzaurus-pxa 2005/01/13 12:27:56-06:00 ti.com!kergoth Update klibc to 0.190, the latest stable version. 2005/01/13 18:11:50+00:00 cambridgebroadband.com!rjt make select work on the apm device for tosa,corgi,poodle and related archictectures 2005/01/13 09:10:02+01:00 hrw.one.pl!hrw justreader: fix Settings file location (fix #204) 2005/01/13 00:32:44+00:00 rpsys.net!RP Fix after merge 2005/01/13 00:26:37+00:00 rpsys.net!RP Merge 2005/01/13 00:23:32+00:00 rpsys.net!RP openzaurus-2.6: Switch to 2.6.11-rc1. Remove patches now merged upstream (8 of them). Add patches to fix upstream bug (reported). Improve MMC driver. 2005/01/12 23:02:21+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/12 23:02:08+00:00 nexus.co.uk!pb fix some postinst/postrm issues in module-init-tools 2005/01/12 23:52:41+01:00 uni-frankfurt.de!mickeyl make the check and the WARNING also work for kernel 2.6.x 2005/01/12 20:32:37+01:00 uni-frankfurt.de!mickeyl improve readme for prism3-firmware 2005/01/12 20:03:32+01:00 uni-frankfurt.de!mickeyl fix qte crashing right after calibration (again). patch courtesy qte-uberhacker Holger 'Zecke' Freyther 2005/01/12 18:42:20+01:00 (none)!br1 added package yamonenv (inside nylon/): read any write yamon environment 2005/01/12 16:40:38+01:00 uni-frankfurt.de!mickeyl add wireless tools v27 2005/01/12 16:05:25+01:00 uni-frankfurt.de!mickeyl upgrade bison to 2.0 2005/01/12 16:04:20+01:00 uni-frankfurt.de!mickeyl use pregenerated yacc files in kgrog. still nonworky though 2005/01/12 12:35:05+01:00 uni-frankfurt.de!mickeyl pcmcia-cs: don't ship config.opts on arm machines 2005/01/12 11:51:05+01:00 uni-frankfurt.de!mickeyl CONFIG_FEATURE_IFUPDOWN_MAPPING=y in busybox defconfig. This adds just 3K but is very useful 2005/01/12 10:27:23+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 10:26:59+01:00 hrw.one.pl!hrw changed tremor SRC_URI to fetch from svn via http 2005/01/12 08:26:26+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/12 08:26:12+00:00 rpsys.net!RP openzaurus-2.6: Update corgi after pushing code upstream 2005/01/12 00:12:52+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/12 00:12:18+01:00 hrw.one.pl!hrw updated kdepimpi to 1.9.16 (also added their fork of gammu) 2005/01/11 23:46:19+01:00 uni-frankfurt.de!mickeyl ipkg-utils has been fixed upstream 2005/01/11 23:39:28+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 17:09:51-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 17:09:37-06:00 ti.com!kergoth Add OpenNTPD, a free NTP implementation from the OpenBSD guys. 2005/01/11 23:39:20+01:00 uni-frankfurt.de!mickeyl opie: use Transformed:Rot0 instead of LinuxFb for kernel 2.6 2005/01/11 21:36:12+01:00 uni-frankfurt.de!mickeyl ship libopie2 examples in libopie2_cvs 2005/01/11 21:30:53+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/11 21:30:43+01:00 uni-frankfurt.de!mickeyl machine.confs: catchup with changes in orinoco package granularity 2005/01/11 20:24:29+00:00 nexus.co.uk!pb remove spurious DEPENDS 2005/01/11 20:58:09+01:00 uni-frankfurt.de!mickeyl orinoco-modules: use KERNEL_OBJECT_SUFFIX and increase package granularity 2005/01/11 20:37:02+01:00 uni-frankfurt.de!mickeyl hostap-modules: use KERNEL_OBJECT_SUFFIX to make it work w/ old and new kernels 2005/01/11 20:21:51+01:00 uni-frankfurt.de!mickeyl set KERNEL_OBJECT_SUFFIX to .ko on 2.6 kernels and .o for earlier kernels 2005/01/11 16:57:01+00:00 rpsys.net!RP openzaurus-2.6: update patch order. Add MMC and SD support 2005/01/11 16:59:54+01:00 (none)!br1 /bin/sh update-alternative calls have to be done in prerm not postrm 2005/01/11 10:22:15-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/11 10:22:07-06:00 ti.com!kergoth Add fnmatch test result to some arm*linux* site files. 2005/01/11 12:05:37+01:00 (none)!br1 added "dash" shell 2005/01/10 20:20:01-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 20:19:53-06:00 ti.com!kergoth Add OpenCVS from cvs. 2005/01/10 23:26:51+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/10 16:34:16-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 16:34:07-06:00 ti.com!kergoth Fix unionfs 1.0.6 make.patch. 2005/01/10 23:26:28+01:00 uni-frankfurt.de!mickeyl it's irk-targus and irk-belkin, not irk-0.11.0 and irk-0.11.1 :( 2005/01/10 20:54:21+01:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/home/hrw/zaurus/bb/openembedded 2005/01/10 14:40:45-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/01/10 14:40:33-06:00 ti.com!kergoth Add didiwiki 0.5. 2005/01/10 20:54:06+01:00 hrw.one.pl!hrw added KGrok into nonworking (I dont know how to fix it's usage of yacc) 2005/01/10 18:52:01+01:00 (none)!koen add matchbox-desktop_svn 2005/01/10 18:42:31+01:00 (none)!koen add matchbox_panel_svn 2005/01/10 18:28:27+01:00 (none)!koen add matchbox-wm_svn 2005/01/10 18:09:30+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 18:09:12+01:00 (none)!koen add libmatchbox_svn 2005/01/10 17:38:04+01:00 uni-frankfurt.de!mickeyl add some extra depends for openzaurus-pxa-2.6 2005/01/10 17:30:19+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/10 17:29:57+01:00 (none)!koen delete unneeded patches for faad2 2005/01/10 17:27:22+01:00 (none)!koen libgpevtype 0.6 in familiar-0.8.0.conf 2005/01/10 14:08:45+01:00 mn-solutions.de!schurig removed cruft 2005/01/10 13:09:37+01:00 (none)!koen don't set PREFERRED_VERSION for gtk+ and bluetooth/dbus in familiar-0.8.1.conf 2005/01/09 20:24:58+00:00 nexus.co.uk!pb add dependency on xpm 2005/01/09 20:22:42+00:00 nexus.co.uk!pb add gnocky 2005/01/09 20:21:04+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 20:20:54+00:00 nexus.co.uk!pb add staging to gnokii 2005/01/09 20:19:35+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 20:18:32+00:00 rpsys.net!RP openzaurus-2.6: Update and use changes to SSP made in 2.6 bk tree (imported by ssp.patch) 2005/01/09 21:12:14+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 21:11:58+01:00 uni-frankfurt.de!mickeyl remove bogus stuff in opie-keytabs 2005/01/09 19:59:57+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 19:59:40+00:00 nexus.co.uk!pb add gnokii 2005/01/09 18:45:34+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/09 18:45:18+01:00 uni-frankfurt.de!mickeyl openzaurus 3.5.3.conf: use opie-cvs for now 2005/01/09 17:27:13+00:00 nexus.co.uk!pb add missing file 2005/01/09 17:21:59+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 17:21:42+00:00 nexus.co.uk!pb demote pciutils and usbutils from Recommends to Suggests in hotplug 2005/01/09 18:11:18+01:00 handhelds.org!CoreDump Remove ressource.patch from libqpe-opie_1.1.8 as it has been applied upstream 2005/01/09 17:01:46+00:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/09 17:01:32+00:00 rpsys.net!RP openzaurus-2.6: changes to help push patches upstream. Break poodle for now... 2005/01/09 17:00:18+00:00 rpsys.net!RP openzaurus-2.6: changes to patches to assist with pushing upstream. Break poodle for now :-/ 2005/01/09 16:07:24+01:00 dyndns.org!reenoo rosetta: it's pkg_postinst, not do_postinst 2005/01/09 14:24:35+00:00 nexus.co.uk!pb update libgpevtype to 0.6 2005/01/09 14:03:18+00:00 nexus.co.uk!pb update gtk+ to 2.6.1 2005/01/09 14:02:36+00:00 nexus.co.uk!pb update glib-2.0 to 2.6.1 2005/01/09 14:01:31+00:00 nexus.co.uk!pb remove some extraneous gtk+ patches 2005/01/09 14:00:43+00:00 nexus.co.uk!pb second attempt at fixing gpe-bluetooth dbus naming problems 2005/01/09 14:57:37+01:00 dyndns.org!reenoo sysvinit: use update-alternatives.bbclass. put PACKAGES/FILES related things in a single place. 2005/01/09 00:47:25+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:46:13+00:00 nexus.co.uk!pb apply patch from Marc Singer to remove spurious trailing space from backslash-continued line 2005/01/09 00:42:35+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to add usbf and bnep0 entries to interfaces file use CONFFILES for netbase under all DISTROs, not just nylon 2005/01/09 00:38:50+00:00 nexus.co.uk!pb apply patch from Paul Eggleton to fix usbnet hotplug on iPAQ 2005/01/09 00:29:52+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/09 00:29:41+00:00 nexus.co.uk!pb apply patch from Marc Singer to correct typo in gpe-package 2005/01/08 15:16:29-08:00 (none)!emte Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into t.(none):/home/OE/speedracer/packages 2005/01/08 15:14:54-08:00 (none)!emte removed kbdd-patched 2005/01/08 16:49:42-05:00 handhelds.org!kergoth Add unionfs 1.0.6. 2005/01/08 20:14:46+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/08 20:14:26+00:00 nexus.co.uk!pb remove figment from gpe base set due to libxml2 dependency 2005/01/08 18:46:11+00:00 rpsys.net!RP openzaurus-2.6: corgi updates: make MAGIC_SYSRQ work + fix reboot bug. w100fb updates for mainline acceptance. 2005/01/08 18:01:30+00:00 nexus.co.uk!pb apply patch from Bob Davies to remove kismet from meta-sectest-gpe 2005/01/08 18:37:36+01:00 hrw.one.pl!hrw added description to librsvg 2005/01/08 18:37:12+01:00 hrw.one.pl!hrw added description to libart-lgpl 2005/01/08 18:36:26+01:00 hrw.one.pl!hrw added description to esound 2005/01/08 18:13:19+01:00 hrw.one.pl!hrw fixed description for Busybox 2005/01/08 18:04:49+01:00 hrw.one.pl!hrw added description to atd BKrev: 41e7d1ednFJIdPS8nrzP9S2cq5B_1A
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/familiar-0.8.1.conf12
-rw-r--r--conf/distro/openmnci.conf285
-rw-r--r--conf/distro/openzaurus-3.5.3.conf5
3 files changed, 12 insertions, 290 deletions
diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index c0798bd452..9e05a58dc0 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -27,7 +27,7 @@ PREFERRED_VERSION_orinoco-modules = "0.13e"
PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-PREFERRED_VERSION_bluez-utils-dbus = "2.13"
+#PREFERRED_VERSION_bluez-utils-dbus = "2.13"
#
# Opie
@@ -47,10 +47,10 @@ PREFERRED_VERSION_matchbox-desktop = "0.9"
PREFERRED_VERSION_matchbox-wm = "0.9"
PREFERRED_VERSION_matchbox-panel = "0.9"
PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_gtk+ = "2.6.0"
-PREFERRED_VERSION_libgpewidget = "0.97"
+#PREFERRED_VERSION_gtk+ = "2.6.0"
+#PREFERRED_VERSION_libgpewidget = "0.97"
PREFERRED_VERSION_libgpepimc = "0.4"
-PREFERRED_VERSION_libgpevtype = "0.5"
+PREFERRED_VERSION_libgpevtype = "0.6"
PREFERRED_VERSION_libschedule = "0.13"
PREFERRED_VERSION_gpe-icons = "0.24"
PREFERRED_VERSION_libgsm = "1.0.10"
@@ -71,8 +71,8 @@ PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
PREFERRED_VERSION_gpe-contacts = "0.34"
PREFERRED_VERSION_gpe-today = "0.08"
PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.22"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
+#PREFERRED_VERSION_dbus = "0.22"
+#PREFERRED_VERSION_gpe-bluetooth = "0.37"
PREFERRED_VERSION_gpe-su = "0.18"
PREFERRED_VERSION_gpe-conf = "0.1.22"
PREFERRED_VERSION_gpe-clock = "0.20"
diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
index 231fea0e2a..93a361a878 100644
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -2,288 +2,13 @@ INHERIT += "package_ipk"
INHERIT += "debian"
-CVSDATE = 20041120
+CVSDATE = 20050107
+CVSDATE_ipkg-utils = 20050110
#ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+#PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "ttyS0"
TARGET_FPU = "soft"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_libtool-native = "1.5.6"
-PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte-for-opie = "2.3.7"
-PREFERRED_VERSION_orinoco-modules = "0.13e"
-PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
-PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
-PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22"
-
-#
-# Opie
-#
-
-OPIE_VERSION = "1.1.7"
-PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
-PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
-PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.3"
-PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-checkbook = "0.8.0"
-PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-oxygen = "1.0.0"
-PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
-# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qcop = "1.0.0"
-PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
-PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
-
-#
-# GPE
-#
-
-PREFERRED_VERSION_libmatchbox = "1.4"
-PREFERRED_VERSION_matchbox = "0.8.1"
-PREFERRED_VERSION_matchbox-common = "0.8"
-PREFERRED_VERSION_matchbox-desktop = "0.8.1"
-PREFERRED_VERSION_matchbox-wm = "0.8.4"
-PREFERRED_VERSION_matchbox-panel = "0.8.3"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
-PREFERRED_VERSION_gtk+ = "2.4.13"
-PREFERRED_VERSION_libgpewidget = "0.95"
-PREFERRED_VERSION_libgpepimc = "0.3"
-PREFERRED_VERSION_libgpevtype = "0.5"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.24"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "3.7"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.73"
-PREFERRED_VERSION_gpe-session-scripts = "0.62"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.50"
-PREFERRED_VERSION_gpe-calendar = "0.58"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.33"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.22"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.22"
-PREFERRED_VERSION_gpe-clock = "0.14"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
-PREFERRED_VERSION_gpe-shield = "0.6"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.44"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.0.12"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.12"
-PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.1"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "1.0"
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 4c068d96ce..17d0431698 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -45,11 +45,8 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11"
# Opie
#
-OPIE_VERSION = "1.1.8"
+OPIE_VERSION = "1.2.0"
include conf/distro/preferred-opie-versions.inc
-PREFERRED_VERSION_libopie2 = "the-latest-please"
-PREFERRED_VERSION_libqpe-opie = "the-latest-please"
-PREFERRED_VERSION_opie-taskbar = "the-latest-please"
#
# GPE