4 files changed, 24 insertions, 49 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index aa7aa0d345..5b5ea40d5b 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -124,7 +124,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh8"
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh9"
 
 PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
 
@@ -138,7 +138,7 @@ PREFERRED_VERSION_file_native  = "4.18"
 PREFERRED_VERSION_fontconfig       = "2.4.1"
 PREFERRED_VERSION_freetype         = "2.3.4"
 PREFERRED_VERSION_freetype-native  = "2.2.1"
-PREFERRED_VERSION_cairo            = "1.4.8"
+PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.10.3"
@@ -318,7 +318,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
     ipkg ipkg-collateral \
-    util-linux-mount util-linux-umount \
     avahi-daemon \
     avahi-autoipd \
     ${EXTRA_STUFF} \
diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf
deleted file mode 100644
index 5f23949d2d..0000000000
--- a/conf/distro/hentges-2.0.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-2.0.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net"
-LICENSE = "MIT"
-
-######################################################################################
-
-require conf/distro/angstrom-2007.1.conf
-
-######################################################################################
-
-require conf/machine/hentges-2.0_common.conf
-require conf/machine/hentges-2.0_${MACHINE}.conf
-
-######################################################################################
-
-DISTRO_VERSION = "1.9+WIP-${DATE}"
-DISTRO_REVISION = "1"
-
-DISTRO = "hentges-2.0"
-DISTRO_NAME = "Hentges"
-
-######################################################################################
-
-# Override FEED_URIS here
-
-######################################################################################
-
-HENTGES_PV = "${DISTRO_VERSION}"
-HENTGES_PR = "${DISTRO_REVISION}"
-
-######################################################################################
-
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index bd5703c909..75e8b86e4d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -50,7 +50,24 @@ SRCDATE_gconf-dbus ?= "20070512"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
-#Misc apps, sorted by alphabet
+# Enlightenment (libs)
+SRCDATE_edb ?= "20070601"
+SRCDATE_enhanve ?= "20070601"
+SRCDATE_engrave ?= "20070601"
+SRCDATE_exml ?= "20070601"
+
+# Enlightenment (apps)
+SRCDATE_edje-viewer = "20070601"
+SRCDATE_emphasis = "20070601"
+SRCDATE_ephoto = "20070601"
+SRCDATE_examine = "20070601"
+SRCDATE_expedite = "20070601"
+SRCDATE_elitaire = "20070504"
+SRCDATE_entice = "20070601"
+SRCDATE_e-utils = "20070601"
+SRCDTE_exhibit = "20070601"
+
+# Misc apps, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
@@ -71,6 +88,7 @@ SRCDATE_madwifi-modules ?= "20060814"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCDATE_mileage ?= "20060814"
 SRCDATE_minimo ?= "20050401"
+SRCDATE_mpd ?= "20070210"
 SRCDATE_mystun-server ?= "20060814"
 SRCDATE_olsrd ?= "20060814"
 SRCDATE_opencvs ?= "20060814"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8679300bc3..c2970d2b99 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
@@ -142,6 +142,6 @@ IGNORE_STRIP_ERRORS = ""
 # Due to upstream instability, and another OE project with conflicting
 # needs, nail down a specific, known-working version of madwifi-ng.
 # Remove this once the madwifi-ng stuff seems to stabilize once again.
-PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
+#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
 
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-\ No newline at end of file
+PREFERRED_VERSION_linux-libc-headers = "2.6.18"