merge of 55fefa60fda5100c3bc1a4ecf8d48d0ea4bb9193

     and bbe482d809300bb4339549751dc0074a94dd6e6e

4 files changed, 8 insertions, 15 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index ce8cef04b3..7a9cb67bca 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -28,8 +28,8 @@ ${PKGDIR}/packages/cyrus-imapd/*.bb \
 ${PKGDIR}/packages/cyrus-sasl/*.bb \
 ${PKGDIR}/packages/db/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
-${PKGDIR}/packages/diffutils/*.bb \
 ${PKGDIR}/packages/diffstat/*.bb \
+${PKGDIR}/packages/diffutils/*.bb \
 ${PKGDIR}/packages/dnsmasq/*.bb \
 ${PKGDIR}/packages/dropbear/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
@@ -55,7 +55,6 @@ ${PKGDIR}/packages/grep/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
-${PKGDIR}/packages/icecast/*.bb \
 ${PKGDIR}/packages/ifupdown/*.bb \
 ${PKGDIR}/packages/initscripts/*.bb \
 ${PKGDIR}/packages/install/*.bb \
@@ -64,13 +63,12 @@ ${PKGDIR}/packages/iperf/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/ipkg/*.bb \
 ${PKGDIR}/packages/iptables/*.bb \
-${PKGDIR}/packages/iputils/*.bb \
 ${PKGDIR}/packages/ircp/*.bb \
 ${PKGDIR}/packages/irssi/*.bb \
 ${PKGDIR}/packages/ixp425-eth/*.bb \
 ${PKGDIR}/packages/ixp4xx/*.bb \
-${PKGDIR}/packages/jpeg/*.bb \
 ${PKGDIR}/packages/joe/*.bb \
+${PKGDIR}/packages/jpeg/*.bb \
 ${PKGDIR}/packages/lcdproc/*.bb \
 ${PKGDIR}/packages/less/*.bb \
 ${PKGDIR}/packages/libaal/*.bb \
@@ -79,7 +77,6 @@ ${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 \
@@ -93,7 +90,6 @@ ${PKGDIR}/packages/libtool/*.bb \
 ${PKGDIR}/packages/libusb/*.bb \
 ${PKGDIR}/packages/libvorbis/*.bb \
 ${PKGDIR}/packages/libxml/*.bb \
-${PKGDIR}/packages/libxslt/*.bb \
 ${PKGDIR}/packages/linux-libc-headers/*.bb \
 ${PKGDIR}/packages/linux/*.bb \
 ${PKGDIR}/packages/lrzsz/*.bb \
@@ -155,8 +151,8 @@ ${PKGDIR}/packages/puppy/*.bb \
 ${PKGDIR}/packages/pvrusb2-mci/*.bb \
 ${PKGDIR}/packages/pwc/*.bb \
 ${PKGDIR}/packages/python/*.bb \
+${PKGDIR}/packages/qc-usb/*.bb \
 ${PKGDIR}/packages/quilt/*.bb \
-${PKGDIR}/packages/qc-usb/*.bb \ 
 ${PKGDIR}/packages/readline/*.bb \
 ${PKGDIR}/packages/reiser4progs/*.bb \
 ${PKGDIR}/packages/reiserfsprogs/*.bb \
@@ -167,7 +163,6 @@ ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
-${PKGDIR}/packages/spca5xx/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
@@ -176,7 +171,6 @@ ${PKGDIR}/packages/sysfsutils/*.bb \
 ${PKGDIR}/packages/syslog-ng/*.bb \
 ${PKGDIR}/packages/sysvinit/*.bb \
 ${PKGDIR}/packages/tar/*.bb \
-${PKGDIR}/packages/tcltk/*.bb \
 ${PKGDIR}/packages/thttpd/*.bb \
 ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
@@ -192,11 +186,9 @@ ${PKGDIR}/packages/vim/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
 ${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
-${PKGDIR}/packages/watchdog/*.bb \
-${PKGDIR}/packages/wireless-tools/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
-${PKGDIR}/packages/x11/*.bb \
+${PKGDIR}/packages/wireless-tools/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
-${PKGDIR}/packages/zlib/*.bb \
 ${PKGDIR}/packages/zd1211/*.bb \
+${PKGDIR}/packages/zlib/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 748228f304..5c57e878c2 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -6,7 +6,7 @@
 # STANDARD OpenSlug DEFINITIONS
 #----------------------------------------------------------------------------------
 DISTRO_NAME = "OpenSlug"
-DISTRO_VERSION = "2.6-beta"
+DISTRO_VERSION = "2.8-beta"
 DISTRO_TYPE ?= "beta"
 
 TARGET_FPU = "soft"
diff --git a/packages/freeze/files/freeze b/packages/freeze/files/freeze
index cf01be7bf5..e282df382a 100644
--- a/packages/freeze/files/freeze
+++ b/packages/freeze/files/freeze
@@ -164,6 +164,7 @@ done | {
 		check 's/_\([0-9.]*\)cvs200[0-9]*$/_\1cvs/p' "$f" ||
 		check 's/_\([0-9.]*\)+cvs200[0-9]*$/_\1+cvs/p' "$f" ||
 		check 's/_0\.1cvs200[0-9]*$/_cvs/p' "$f" ||
+		check 's/_\([0-9.]*\)+cvs200[0-9]*$/_cvs/p' "$f" ||
 		check 's/_0\.1cvs\(200[0-9]*\)$/_\1/p' "$f" || 
 		check 's/_\([0-9.]*\)+svn200[0-9]*$/_svn/p' "$f" || {
 			bberror "($p,$v,$r): package not found" >&2
diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb
index c31fc678cd..5311f7a720 100644
--- a/packages/freeze/freeze.bb
+++ b/packages/freeze/freeze.bb
@@ -17,7 +17,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>"
 SECTION = "console/networking"
 PRIORITY = "optional"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 PATCH_DEPENDS = ""