From 349e517f0d8f58979ad5ab5f5e09cd8ceddc6386 Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Sat, 19 Aug 2006 19:22:47 +0200
Subject: [PATCH] familiar-0.8.4.conf: this is Familiar v0.8.4.

Signed-off-by: Rene Wagner <rw@handhelds.org>
---
 .../conf/distro/familiar-0.8.3.conf           | 91 -------------------
 .../conf/distro/familiar-0.8.4.conf           |  2 +-
 2 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 org.handhelds.familiar/conf/distro/familiar-0.8.3.conf

diff --git a/org.handhelds.familiar/conf/distro/familiar-0.8.3.conf b/org.handhelds.familiar/conf/distro/familiar-0.8.3.conf
deleted file mode 100644
index 0de7d7c..0000000
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.3.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-DISTRO = "familiar"
-DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.3"
-
-include conf/distro/familiar.conf
-
-
-#DISTRO_TYPE = "debug"
-DISTRO_TYPE = "release"
-
-FEED_URIS += " \
-        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-	${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \
-	locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \
-	locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \
-	locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de"
-
-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
-
-#newer hostap modules didn't seem to work for me 
-PREFERRED_VERSION_hostap-modules ?= "0.3.9"
-
-#2.4 machines prefer 0.13e ones
-PREFERRED_VERSION_orinoco-modules ?= "0.13e"
-
-#but 0.13e doesn't build against 2.6
-PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
-PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
-
-#prefer a newer hh.org cvs kernel
-CVSDATE_handhelds-pxa-2.6 = "20051221"
-CVSDATE_LAB-kernel = "20051221"
-
-#The CSL compiler is unusable because
-# 1) certain programs stop to compile
-# 2) more programs segfault
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk ?= "3.4.4"
-
-
-#
-# Machines section
-#
-
-# select kernel version for the zaurus family
-
-ZKERNEL_VERSION_poodle = "2.4" 
-ZKERNEL_VERSION_collie = "2.4"
-ZKERNEL_VERSION_c7x0   = "2.6"
-ZKERNEL_VERSION_spitz  = "2.4"
-ZKERNEL_VERSION_akita  = "2.4"
-ZKERNEL_VERSION_borzoi = "2.4"
-ZKERNEL_VERSION_tosa   = "2.4" 
-
-
-#
-# Opie
-#
-
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
-OPIE_VERSION = "1.2.1"
-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-2.7.inc
-
-#
-# E
-#
-include conf/distro/preferred-e-versions.inc
-
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 533232f..39375c8 100644
--- a/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
+++ b/org.handhelds.familiar/conf/distro/familiar-0.8.4.conf
@@ -1,6 +1,6 @@
 DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "v0.8.4-rc3"
+DISTRO_VERSION = "v0.8.4"
 
 include conf/distro/familiar.conf
 include conf/distro/familiar-feeds.inc
-- 
2.41.0