Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/10 11:35:50+02:00 utwente.nl!koen
  Rename: conf/distro/familiar-0.9.0.conf -> conf/distro/familiar-0.8.3.conf

2005/06/10 10:44:09+02:00 utwente.nl!koen
preferred-gpe-versions.inc:  reflect xserver changes

BKrev: 42a95ffaVK7-p3HaRv71VzLrHKjd_A

diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/conf/distro/familiar-0.9.0.conf b/conf/distro/familiar-0.9.0.conf
deleted file mode 100644 (file)
index d617780..0000000
--- a/conf/distro/familiar-0.9.0.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-include conf/distro/familiar.conf
-
-DISTRO = "familiar"
-DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.9.0-snapshots-${DATE}"
-
-DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-
-FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-       updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
-
-#CVSDATE = 20050331
-
-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_VERSION_binutils-cross = "2.15.91.0.2"
-#PREFERRED_VERSION_gcc-cross = "3.4.4"
-#PREFERRED_VERSION_gcc-cross-initial = "3.4.4
-#PREFERRED_VERSION_libtool-native = "1.5.6"
-#PREFERRED_VERSION_libtool-cross= "1.5.6"
-
-#
-# Opie
-#
-
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
-#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"
-PREFERRED_PROVIDER_x11 = "diet-x11"
-
-include conf/distro/preferred-gpe-versions.inc
-
-#
-# E
-#
-include conf/distro/preferred-e-versions.inc
-

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index dfc0ec6..62c343c 100644 (file)
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -3,7 +3,6 @@
 #
 
 #work around some breakages
-#CVSDATE_xserver-kdrive=20050207
 #CVSDATE_xext=20050222
 
 #set some preferred providers: