From ffd5a7ccc05c74b7229cb250f4d9f5031208dd65 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 29 Mar 2007 13:55:37 +0000
Subject: angstrom-2007.1.conf: add avahi-autoipd

---
 conf/distro/angstrom-2007.1.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 8d74633821..59a65de663 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -85,7 +85,7 @@ FEED_URIS += " \
 # We will lock down a SRCDATE when we go into release mode
 #SRCDATE = "20070303"
 
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
+#PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
 
@@ -139,9 +139,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.10"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
-PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+#PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 PREFERRED_VERSION_gtk+ = "2.10.10"
 PREFERRED_VERSION_libgnomeui = "2.16.1"
 
@@ -276,6 +276,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     ipkg ipkg-collateral \
     util-linux-mount util-linux-umount \
     avahi-daemon \
+    avahi-autoipd \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
     "
-- 
cgit v1.2.3