familiar-0.8.4.conf: this is v0.8.4-rc3.

[familiar-h63xx-build.git] / org.handhelds.familiar / conf / distro / familiar-0.8.4.conf

diff --git a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
index 0c63911a2ea8d5ac07482bdd8f409d8e82c43dd1..a2377aa4ee13e44ed70ec6b649cddadaf201aabf 100644 (file)
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -1,14 +1,14 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.4-rc2"
+DISTRO_VERSION = "v0.8.4-rc3"
 
 include conf/distro/familiar.conf
 include conf/distro/familiar-feeds.inc
 
 #always try downloading from handhelds.org first
 INHERIT += "simplepremirror"
-SIMPLE_PREMIRROR = "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
-CVS_TARBALL_STASH = "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
+SIMPLE_PREMIRROR ?= "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
+CVS_TARBALL_STASH ?= "http://familiar.handhelds.org/source/${DISTRO_VERSION}/sources/"
 
 
 DISTRO_TYPE = "release"
@@ -16,10 +16,6 @@ DISTRO_TYPE = "release"
 
 CVSDATE = 20051212
 
-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_PROVIDER_virtual/libiconv=glibc
 PREFERRED_PROVIDER_virtual/libintl=glibc
 PREFERRED_PROVIDER_x11=diet-x11
@@ -68,10 +64,9 @@ ZKERNEL_VERSION_tosa   = "2.4"
 # Opie
 #
 
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
+QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.1"
+
 include conf/distro/preferred-opie-versions.inc
 
 #