merge of 2109e112bb3a836e7b627253f84a9efa2a19f779

     and d5919dcd4efcc3277f396379d72ee2734c1b8924

2 files changed, 0 insertions, 173 deletions

diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
deleted file mode 100644
index 3e070c35b4..0000000000
--- a/conf/distro/openzaurus-3.5.2.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-include conf/distro/openzaurus.conf
-DISTRO = "openzaurus"
-
-FEED_URIS += " \
-	upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ 	\
-	base##http://openzaurus.org/official/unstable/3.5.2/feed/base/		\
-	libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/		\
-	console##http://openzaurus.org/official/unstable/3.5.2/feed/console"
-
-CVSDATE = 20041127
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-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"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-#ENABLE_SYSREQ = "yes"
-
-PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
-PREFERRED_VERSION_gcc-cross = "3.4.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
-PREFERRED_VERSION_libtool-native = "1.5.6"
-PREFERRED_VERSION_libtool-cross= "1.5.6"
-PREFERRED_VERSION_qte = "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"
-PREFERRED_VERSION_bluez-utils-dbus = "2.11"
-
-#
-# Opie
-#
-OPIE_VERSION = "1.1.7"
-include conf/distro/preferred-opie-versions.inc
-
-
-#
-# 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.96"
-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.40"
-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
deleted file mode 100644
index e8ed0209e1..0000000000
--- a/conf/distro/openzaurus-3.5.3.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-include conf/distro/openzaurus.conf
-DISTRO = "openzaurus"
-DISTRO_NAME = "OpenZaurus"
-DISTRO_VERSION = "3.5.3"
-DISTRO_TYPE = "release"
-
-FEED_URIS += " \
-	upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/ 	\
-	base##http://openzaurus.org/official/unstable/3.5.3/feed/base/		\
-	libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/		\
-	console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
-	devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
-
-CVSDATE = "20050403"
-
-#
-# Zaurus
-#
-
-ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-#
-# Base
-#
-
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_ipkg-native = "0.99.144"
-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"
-
-#
-# Opie
-#
-
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-
-OPIE_VERSION = "1.2.0"
-include conf/distro/preferred-opie-versions.inc
-
-#
-# GPE
-#
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-GPE_EXTRA_INSTALL += " gsoko"
-
-include conf/distro/preferred-gpe-versions.inc
-