4 files changed, 9 insertions, 8 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 7f076a6c84..17755e35e9 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -11,8 +11,7 @@ ${PKGDIR}/packages/bash/*.bb \
 ${PKGDIR}/packages/bind/*.bb \
 ${PKGDIR}/packages/binutils/*.bb \
 ${PKGDIR}/packages/bison/*.bb \
-${PKGDIR}/packages/bluez-libs/*.bb \
-${PKGDIR}/packages/bluez-utils/*.bb \
+${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
@@ -79,6 +78,7 @@ ${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libgsm/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
 ${PKGDIR}/packages/libid3tag/*.bb \
 ${PKGDIR}/packages/liblockfile/*.bb \
 ${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 6e6a07aa58..5919f351fb 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -39,7 +39,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.82"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.65"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
 PREFERRED_VERSION_gpe-calendar ?= "0.65"
@@ -86,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
+PREFERRED_VERSION_poppler ?= "0.3.3"
+PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 5ecc44fb03..a45c396c8b 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -10,8 +10,7 @@ ${PKGDIR}/packages/bash/*.bb \
 ${PKGDIR}/packages/bind/*.bb \
 ${PKGDIR}/packages/binutils/*.bb \
 ${PKGDIR}/packages/bison/*.bb \
-${PKGDIR}/packages/bluez-libs/*.bb \
-${PKGDIR}/packages/bluez-utils/*.bb \
+${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
@@ -102,7 +101,6 @@ ${PKGDIR}/packages/ncftp/*.bb \
 ${PKGDIR}/packages/ncurses/*.bb \
 ${PKGDIR}/packages/netbase/*.bb \
 ${PKGDIR}/packages/netpbm/*.bb \
-${PKGDIR}/packages/nslu2-binary-only/*.bb \
 ${PKGDIR}/packages/ntp/*.bb \
 ${PKGDIR}/packages/obexftp/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
@@ -136,7 +134,6 @@ ${PKGDIR}/packages/samba/*.bb \
 ${PKGDIR}/packages/sane-backends/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
-${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
@@ -148,7 +145,6 @@ ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
 ${PKGDIR}/packages/uclibc/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
-${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/update-rc.d/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index be2e54e917..9239e676c7 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -132,4 +132,6 @@ PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
 
+PREFERRED_VERSION_samba ?= "3.0.14a"
+
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"