merge of '0af36442f2b5ad5f505d802f19a109562afaee66'

     and '0dee125d6c77c5911cd60676bb87681b7565e13f'

17 files changed, 174 insertions, 407 deletions

diff --git a/packages/flac/flac-1.1.0/.mtn2git_empty b/packages/flac/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/flac/flac-1.1.0/.mtn2git_empty
+++ b/packages/flac/files/.mtn2git_empty
diff --git a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch b/packages/flac/files/disable-xmms-plugin.patch
index e42fcbd84d..e42fcbd84d 100644
--- a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch
+++ b/packages/flac/files/disable-xmms-plugin.patch
diff --git a/packages/flac/flac-1.1.0/xmms.m4 b/packages/flac/files/xmms.m4
index 6d1489bf19..6d1489bf19 100644
--- a/packages/flac/flac-1.1.0/xmms.m4
+++ b/packages/flac/files/xmms.m4
diff --git a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch b/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
deleted file mode 100644
index e42fcbd84d..0000000000
--- a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- flac-1.1.0/src/Makefile.am.orig	2004-12-25 01:11:45.000000000 +0100
-+++ flac-1.1.0/src/Makefile.am	2004-12-25 01:12:10.000000000 +0100
-@@ -15,10 +15,6 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--if FLaC__HAS_XMMS
--XMMS_DIRS = plugin_xmms
--endif
--
- if FLaC__HAS_OGG
- OGGFLAC_DIRS = libOggFLAC libOggFLAC++
- OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
-@@ -33,7 +29,6 @@
- 	metaflac \
- 	monkeys_audio_utilities \
- 	plugin_common \
--	$(XMMS_DIRS) \
- 	plugin_winamp2 \
- 	plugin_winamp3 \
- 	test_grabbag \
diff --git a/packages/flac/flac-1.1.2/xmms.m4 b/packages/flac/flac-1.1.2/xmms.m4
deleted file mode 100644
index 6d1489bf19..0000000000
--- a/packages/flac/flac-1.1.2/xmms.m4
+++ /dev/null
@@ -1,148 +0,0 @@
-# CFLAGS and library paths for XMMS
-# written 15 December 1999 by Ben Gertzfield <che@debian.org>
-
-dnl Usage:
-dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-dnl Example:
-dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
-dnl
-dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, 
-dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, 
-dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
-dnl and XMMS_VERSION for your plugin pleasure.
-dnl
-
-dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
-AC_DEFUN(XMMS_TEST_VERSION, [
-
-# Determine which version number is greater. Prints 2 to stdout if	
-# the second number is greater, 1 if the first number is greater,	
-# 0 if the numbers are equal.						
-									
-# Written 15 December 1999 by Ben Gertzfield <che@debian.org>		
-# Revised 15 December 1999 by Jim Monty <monty@primenet.com>		
-									
-    AC_PROG_AWK
-    xmms_got_version=[` $AWK '						\
-BEGIN {									\
-    print vercmp(ARGV[1], ARGV[2]);					\
-}									\
-									\
-function vercmp(ver1, ver2,    ver1arr, ver2arr,			\
-                               ver1len, ver2len,			\
-                               ver1int, ver2int, len, i, p) {		\
-									\
-    ver1len = split(ver1, ver1arr, /\./);				\
-    ver2len = split(ver2, ver2arr, /\./);				\
-									\
-    len = ver1len > ver2len ? ver1len : ver2len;			\
-									\
-    for (i = 1; i <= len; i++) {					\
-        p = 1000 ^ (len - i);						\
-        ver1int += ver1arr[i] * p;					\
-        ver2int += ver2arr[i] * p;					\
-    }									\
-									\
-    if (ver1int < ver2int)						\
-        return 2;							\
-    else if (ver1int > ver2int)						\
-        return 1;							\
-    else								\
-        return 0;							\
-}' $1 $2`]								
-
-    if test $xmms_got_version -eq 2; then 	# failure
-	ifelse([$4], , :, $4)			
-    else  					# success!
-	ifelse([$3], , :, $3)
-    fi
-])
-
-AC_DEFUN(AM_PATH_XMMS,
-[
-AC_ARG_WITH(xmms-prefix,[  --with-xmms-prefix=PFX  Prefix where XMMS is installed (optional)],
-	xmms_config_prefix="$withval", xmms_config_prefix="")
-AC_ARG_WITH(xmms-exec-prefix,[  --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
-	xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
-
-if test x$xmms_config_exec_prefix != x; then
-    xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
-    if test x${XMMS_CONFIG+set} != xset; then
-	XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
-    fi
-fi
-
-if test x$xmms_config_prefix != x; then
-    xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
-    if test x${XMMS_CONFIG+set} != xset; then
-  	XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
-    fi
-fi
-
-AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
-min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
-
-if test "$XMMS_CONFIG" = "no"; then
-    no_xmms=yes
-else
-    XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
-    XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
-    XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
-    XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
-    XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
-    XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
-					--visualization-plugin-dir`
-    XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
-    XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
-    XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
-    XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
-
-    XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
-fi
-
-AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
-
-if test "x$no_xmms" = x; then
-    AC_MSG_RESULT(yes)
-    ifelse([$2], , :, [$2])
-else
-    AC_MSG_RESULT(no)
-
-    if test "$XMMS_CONFIG" = "no" ; then
-	echo "*** The xmms-config script installed by XMMS could not be found."
-      	echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
-	echo "*** your path, or set the XMMS_CONFIG environment variable to the"
-	echo "*** full path to xmms-config."
-    else
-	if test "$no_xmms" = "version"; then
-	    echo "*** An old version of XMMS, $XMMS_VERSION, was found."
-	    echo "*** You need a version of XMMS newer than $min_xmms_version."
-	    echo "*** The latest version of XMMS is always available from"
-	    echo "*** http://www.xmms.org/"
-	    echo "***"
-
-            echo "*** If you have already installed a sufficiently new version, this error"
-            echo "*** probably means that the wrong copy of the xmms-config shell script is"
-            echo "*** being found. The easiest way to fix this is to remove the old version"
-            echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
-            echo "*** correct copy of xmms-config. (In this case, you will have to"
-            echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
-            echo "*** so that the correct libraries are found at run-time)"
-	fi
-    fi
-    XMMS_CFLAGS=""
-    XMMS_LIBS=""
-    ifelse([$3], , :, [$3])
-fi
-AC_SUBST(XMMS_CFLAGS)
-AC_SUBST(XMMS_LIBS)
-AC_SUBST(XMMS_VERSION)
-AC_SUBST(XMMS_DATA_DIR)
-AC_SUBST(XMMS_PLUGIN_DIR)
-AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
-AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
-AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
-AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
-AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
-])
diff --git a/packages/flac/flac.inc b/packages/flac/flac.inc
new file mode 100644
index 0000000000..79fa504fec
--- /dev/null
+++ b/packages/flac/flac.inc
@@ -0,0 +1,81 @@
+DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
+LICENSE = "BSD GPL"
+SECTION = "libs"
+DEPENDS = "libogg"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
+	   file://disable-xmms-plugin.patch;patch=1 \
+	   file://xmms.m4"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
+		--with-ogg-libraries=${STAGING_LIBDIR} \
+		--with-ogg-includes=${STAGING_INCDIR} \
+		--without-xmms-prefix \
+		--without-xmms-exec-prefix \
+		--without-libiconv-prefix \
+		--without-id3lib"
+
+do_configure () {
+	install -d ${S}/m4
+	install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
+	autotools_do_configure
+	# removes '-read-only-relocs' which is enabled for PowerPC builds.
+	# It makes the build fail, other archs are not affected. Fixes #1775.
+	sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
+}
+
+do_stage () {
+	install -d ${STAGING_DATADIR}/aclocal
+
+	oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/OggFLAC
+	install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
+
+	install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
+	install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
+	install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
+	install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/FLAC
+	install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
+	install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
+	install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
+	install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
+	install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
+	install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
+	install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
+	install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
+	install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
+	install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
+	install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
+	install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
+	install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h
+	install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/FLAC++
+	install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
+	install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
+	install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
+	install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
+	install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
+	install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+
+	oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/OggFLAC++
+	install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
+	install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
+	install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
+	install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
+	install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES += "libflac libflac++ liboggflac liboggflac++"
+FILES_${PN} = "${bindir}/*"
+FILES_libflac = "${libdir}/libFLAC.so.*"
+FILES_libflac++ = "${libdir}/libFLAC++.so.*"
+FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
+FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb
index bcc4e01048..debe8d73de 100644
--- a/packages/flac/flac_1.1.0.bb
+++ b/packages/flac/flac_1.1.0.bb
@@ -1,78 +1,3 @@
-DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
-LICENSE = "BSD GPL"
-SECTION = "libs"
-DEPENDS = "libogg"
-PR = "r5"
+require flac.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
-	   file://disable-xmms-plugin.patch;patch=1 \
-	   file://xmms.m4"
-S = "${WORKDIR}/flac-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
-		--with-ogg-libraries=${STAGING_LIBDIR} \
-		--with-ogg-includes=${STAGING_INCDIR} \
-		--without-xmms-prefix \
-		--without-xmms-exec-prefix \
-		--without-libiconv-prefix \
-		--without-id3lib"
-
-PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}/*"
-FILES_libflac = "${libdir}/libFLAC.so.*"
-FILES_libflac++ = "${libdir}/libFLAC++.so.*"
-FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
-FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
-
-do_configure () {
-	install -d ${S}/m4
-	install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
-	autotools_do_configure
-}
-
-do_stage () {
-	install -d ${STAGING_DATADIR}/aclocal
-
-	oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/OggFLAC
-	install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
-	install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
-	install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
-	install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
-	install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/FLAC
-	install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
-	install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
-	install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
-	install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
-	install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
-	install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
-	install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
-	install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
-	install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
-	install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
-	install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
-	install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
-	install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/FLAC++
-	install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
-	install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
-	install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
-	install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
-	install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
-	install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/OggFLAC++
-	install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
-	install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
-	install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
-	install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
-	install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-}
+PR = "r6"
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index 85ffc9beb9..69eb07125e 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/packages/flac/flac_1.1.2.bb
@@ -1,84 +1,13 @@
-DESCRIPTION = "FLAC is a Free Lossless Audio Codec."
-LICENSE = "BSD GPL"
-SECTION = "libs"
-DEPENDS = "libogg"
-PR = "r5"
+require flac.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
-	   file://disable-xmms-plugin.patch;patch=1 \
-	   file://xmms.m4"
+PR = "r6"
 
-S = "${WORKDIR}/flac-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
-		--with-ogg-libraries=${STAGING_LIBDIR} \
-		--with-ogg-includes=${STAGING_INCDIR} \
-		--without-xmms-prefix \
-		--without-xmms-exec-prefix \
-		--without-libiconv-prefix \
-		--without-id3lib"
-
-PACKAGES += "libflac libflac++ liboggflac liboggflac++"
-FILES_${PN} = "${bindir}/*"
-FILES_libflac = "${libdir}/libFLAC.so.*"
-FILES_libflac++ = "${libdir}/libFLAC++.so.*"
-FILES_liboggflac = "${libdir}/libOggFLAC.so.*"
-FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*"
-
-do_configure () {
-	install -d ${S}/m4
-	install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
-	autotools_do_configure
+do_configure_append () {
 	# removes '-read-only-relocs' which is enabled for PowerPC builds.
 	# It makes the build fail, other archs are not affected. Fixes #1775.
 	sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
 }
 
-do_stage () {
-	install -d ${STAGING_DATADIR}/aclocal
-
-	oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/OggFLAC
-	install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
-
-	install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
-	install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
-	install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
-	install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/FLAC
-	install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h
-	install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h
-	install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h
-	install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h
-	install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h
-	install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h
-	install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h
-	install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h
-	install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h
-	install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h
-	install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h
-	install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h
+do_stage_append () {
 	install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h
-	install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/FLAC++
-	install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h
-	install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h
-	install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h
-	install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h
-	install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h
-	install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/
-
-	oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/OggFLAC++
-	install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h
-	install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h
-	install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h
-	install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h
-	install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index 34ae157094..5bd5f987b6 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "ffmpeg gstreamer zlib"
-PR = "r1"
+PR = "r2"
 
 # This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty
+++ /dev/null
diff --git a/packages/flac/flac-1.1.2/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/flac/flac-1.1.2/.mtn2git_empty
+++ b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty
diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch
index c9f40c8a5f..c9f40c8a5f 100644
--- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
+++ b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch
index 6feb0060c5..6feb0060c5 100644
--- a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch
+++ b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
index 1079d23fbf..a662acbd42 100644
--- a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch
+++ b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch
@@ -1,6 +1,6 @@
-diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4
+diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/acinclude.m4
 --- kdenox/acinclude.m4	2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/acinclude.m4	2007-02-25 22:00:27.000000000 +1300
++++ kdenox/acinclude.m4	2007-02-25 22:00:27.000000000 +1300
 @@ -880,7 +880,7 @@
  )
  
@@ -10,9 +10,9 @@ diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m
    AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]),
    kde_use_qt_emb_rtti=$enableval,
    kde_use_qt_emb_rtti=no
-diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in
+diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/configure.in
 --- kdenox/configure.in	2007-02-12 22:26:21.000000000 +1300
-+++ kdenox_new/configure.in	2007-02-25 17:49:59.000000000 +1300
++++ kdenox/configure.in	2007-02-25 17:49:59.000000000 +1300
 @@ -60,10 +60,10 @@
  
  
@@ -26,9 +26,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.i
  fi
  
  dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in
+diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox/configure.in.in
 --- kdenox/configure.in.in	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/configure.in.in	2007-02-25 17:49:27.000000000 +1300
++++ kdenox/configure.in.in	2007-02-25 17:49:27.000000000 +1300
 @@ -56,10 +56,10 @@
  
  
@@ -42,9 +42,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configur
  fi
  
  dnl Checks for header files.
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox/konq-embed/dropin/kfiledialog.cpp
 --- kdenox/konq-embed/dropin/kfiledialog.cpp	2007-02-12 22:25:57.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kfiledialog.cpp	2007-02-24 03:29:25.000000000 +1300
++++ kdenox/konq-embed/dropin/kfiledialog.cpp	2007-02-24 03:29:25.000000000 +1300
 @@ -23,6 +23,7 @@
  
  
@@ -53,9 +53,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp k
  
  #include <qlayout.h>
  #include <qconfig.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp
 --- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp	2007-02-24 03:32:31.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp	2007-02-24 03:32:31.000000000 +1300
 @@ -23,7 +23,9 @@
  */
  
@@ -66,9 +66,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmana
  #include <kconfig.h>
  #include <ioslave_defaults.h>
  #include <kdeversion.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox/konq-embed/dropin/kio/progressbase.cpp
 --- kdenox/konq-embed/dropin/kio/progressbase.cpp	2007-02-12 22:25:56.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp	2007-02-24 03:33:10.000000000 +1300
++++ kdenox/konq-embed/dropin/kio/progressbase.cpp	2007-02-24 03:33:10.000000000 +1300
 @@ -18,6 +18,7 @@
  
  #include "jobclasses.h"
@@ -77,9 +77,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.
  
  //namespace KIO {
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox/konq-embed/ipkg/preinst
 --- kdenox/konq-embed/ipkg/preinst	1970-01-01 12:00:00.000000000 +1200
-+++ kdenox_new/konq-embed/ipkg/preinst	2007-02-25 21:20:10.000000000 +1300
++++ kdenox/konq-embed/ipkg/preinst	2007-02-25 21:20:10.000000000 +1300
 @@ -0,0 +1,15 @@
 +#!/bin/sh
 +
@@ -96,9 +96,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/
 +    fi
 +done
 +
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h
 --- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h	2007-02-12 21:31:39.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h	2007-02-25 16:15:28.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h	2007-02-25 16:15:28.000000000 +1300
 @@ -26,6 +26,8 @@
  #include <qvaluelist.h>
  #include "kdelibs_export.h"
@@ -108,9 +108,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultiple
  class KMultipleDragPrivate;
  /**
   * This class makes it easy for applications to provide a drag object
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox/konq-embed/kdesrc/khtml/css/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am	2007-02-25 16:36:23.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/css/Makefile.am	2007-02-25 16:36:23.000000000 +1300
 @@ -39,7 +39,7 @@
  INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
   -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \
@@ -120,9 +120,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefil
  
  cssdir = $(kde_datadir)/khtml/css
  css_DATA = html4.css quirks.css
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am	2007-02-25 16:35:07.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am	2007-02-25 16:35:07.000000000 +1300
 @@ -47,7 +47,7 @@
  #	css_extensions.h
  
@@ -132,9 +132,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefil
  
  SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am	2007-02-25 17:24:35.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am	2007-02-25 17:24:35.000000000 +1300
 @@ -16,7 +16,7 @@
  #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  #    Boston, MA 02110-1301, USA.
@@ -144,9 +144,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefi
  
  KDE_CXXFLAGS = $(USE_EXCEPTIONS)
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp
 --- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp	2007-02-25 17:27:39.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp	2007-02-25 17:27:39.000000000 +1300
 @@ -38,6 +38,10 @@
  #include <qobject.h>
  #include <kdebug.h>
@@ -158,9 +158,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhtt
  #ifdef APPLE_CHANGES
  #include "KWQLoader.h"
  #else
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox/konq-embed/kdesrc/khtml/html/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am	2007-02-25 16:39:50.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/html/Makefile.am	2007-02-25 16:39:50.000000000 +1300
 @@ -43,7 +43,7 @@
   -I$(top_srcdir)/kio/kssl \
   -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \
@@ -170,9 +170,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefi
  
  # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf
  doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp
 --- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp	2007-02-25 17:22:46.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp	2007-02-25 17:22:46.000000000 +1300
 @@ -3221,14 +3221,14 @@
          {
            khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent());
@@ -211,9 +211,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.
      connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection()));
  #endif
      //kdDebug( 6000 ) << "selectedText = " << text << endl;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am	2007-02-25 16:33:47.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am	2007-02-25 16:33:47.000000000 +1300
 @@ -32,7 +32,7 @@
  	stringit.h htmlhashes.h helper.h shared.h arena.h 
  
@@ -223,9 +223,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefi
  
  SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am	2007-02-25 16:40:50.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am	2007-02-25 16:40:50.000000000 +1300
 @@ -42,7 +42,7 @@
  	render_generated.h enumerate.h
  
@@ -235,9 +235,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/M
  
  SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h
 --- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h	2007-02-12 21:31:42.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h	2007-02-25 16:56:00.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h	2007-02-25 16:56:00.000000000 +1300
 @@ -46,12 +46,14 @@
  
  #include <qcolor.h>
@@ -254,9 +254,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r
  
  namespace khtml {
      class RenderStyle;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp
 --- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp	2007-02-25 16:44:58.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp	2007-02-25 16:44:58.000000000 +1300
 @@ -46,6 +46,7 @@
  #include <kdebug.h>
  #include <kglobal.h>
@@ -265,9 +265,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r
  #include "khtmlview.h"
  #include <khtml_part.h>
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h
 --- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h	2007-02-25 16:56:49.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h	2007-02-25 16:56:49.000000000 +1300
 @@ -30,6 +30,7 @@
  #include <qcolor.h>
  #include <qptrvector.h>
@@ -276,9 +276,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r
  
  #include "rendering/render_box.h"
  #include "rendering/render_block.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h
 --- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h	2007-02-25 16:46:39.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h	2007-02-25 16:46:39.000000000 +1300
 @@ -31,6 +31,7 @@
  #include "rendering/render_line.h"
  
@@ -287,9 +287,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r
  #include <assert.h>
  
  class QPainter;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am
 --- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am	2007-02-25 16:38:27.000000000 +1300
++++ kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am	2007-02-25 16:38:27.000000000 +1300
 @@ -37,7 +37,7 @@
  
  INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
@@ -299,9 +299,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefil
  
  SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox/konq-embed/kdesrc/kjs/dtoa.cpp
 --- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp	2007-02-25 18:22:33.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/dtoa.cpp	2007-02-25 18:22:33.000000000 +1300
 @@ -1,4 +1,9 @@
 -#ifndef KONQ_EMBEDDED
 +#include <config.h>
@@ -322,9 +322,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kden
  #include "stdlib.h"
  
  #ifdef WORDS_BIGENDIAN
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox_new/konq-embed/kdesrc/kjs/dtoa.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox/konq-embed/kdesrc/kjs/dtoa.h
 --- kdenox/konq-embed/kdesrc/kjs/dtoa.h	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.h	2007-02-25 18:20:51.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/dtoa.h	2007-02-25 18:20:51.000000000 +1300
 @@ -23,14 +23,11 @@
  #ifndef _KJS_DTOA_H_
  #define _KJS_DTOA_H_
@@ -342,9 +342,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox
 -
 +         
  #endif /* _KJS_DTOA_H */
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox/konq-embed/kdesrc/kjs/number_object.cpp
 --- kdenox/konq-embed/kdesrc/kjs/number_object.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp	2007-02-25 18:05:36.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/number_object.cpp	2007-02-25 18:05:36.000000000 +1300
 @@ -20,6 +20,8 @@
   *
   */
@@ -354,9 +354,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object
  #include "value.h"
  #include "object.h"
  #include "types.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox/konq-embed/kdesrc/kjs/ustring.cpp
 --- kdenox/konq-embed/kdesrc/kjs/ustring.cpp	2007-02-12 22:26:20.000000000 +1300
-+++ kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp	2007-02-25 18:10:22.000000000 +1300
++++ kdenox/konq-embed/kdesrc/kjs/ustring.cpp	2007-02-25 18:10:22.000000000 +1300
 @@ -21,9 +21,7 @@
   *
   */
@@ -367,9 +367,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp k
  
  #include <stdlib.h>
  #include <stdio.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox_new/konq-embed/src/actions/konqe.rc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox/konq-embed/src/actions/konqe.rc
 --- kdenox/konq-embed/src/actions/konqe.rc	1970-01-01 12:00:00.000000000 +1200
-+++ kdenox_new/konq-embed/src/actions/konqe.rc	2007-02-25 21:20:10.000000000 +1300
++++ kdenox/konq-embed/src/actions/konqe.rc	2007-02-25 21:20:10.000000000 +1300
 @@ -0,0 +1,107 @@
 +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 +<kpartgui name="konqe" version="1">
@@ -478,9 +478,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kde
 + <Action name="edit_paste"/>
 +</ToolBar>
 +</kpartgui>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox/konq-embed/src/bookmarkeditimpl.cc
 --- kdenox/konq-embed/src/bookmarkeditimpl.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditimpl.cc	2007-02-25 19:17:29.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditimpl.cc	2007-02-25 19:17:29.000000000 +1300
 @@ -24,6 +24,8 @@
  
  #include "bookmarkeditimpl.h"
@@ -490,9 +490,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc
  #if defined(ENABLE_BOOKMARKS)
  
  #include "mainwindowbase.h"
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox_new/konq-embed/src/bookmarkeditor.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox/konq-embed/src/bookmarkeditor.cc
 --- kdenox/konq-embed/src/bookmarkeditor.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditor.cc	2007-02-25 17:40:34.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditor.cc	2007-02-25 17:40:34.000000000 +1300
 @@ -16,6 +16,8 @@
  #include <qimage.h>
  #include <qpixmap.h>
@@ -502,9 +502,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kd
  namespace
  {
  QPixmap getPngPixmap( const QString &name )
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox/konq-embed/src/bookmarkeditorhierarchical.cc
 --- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc	2007-02-25 20:46:27.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.cc	2007-02-25 20:46:27.000000000 +1300
 @@ -22,11 +22,20 @@
  
  */
@@ -535,9 +535,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar
      edit->location->setEnabled(false);
      edit->location->hide();
      edit->TextLabel2->hide();
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox/konq-embed/src/bookmarkeditorhierarchical.h
 --- kdenox/konq-embed/src/bookmarkeditorhierarchical.h	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h	2007-02-25 18:27:17.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.h	2007-02-25 18:27:17.000000000 +1300
 @@ -22,9 +22,10 @@
  #ifndef __bookmarkeditorhierarchical_h__
  #define __bookmarkeditorhierarchical_h__
@@ -550,9 +550,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar
  #include "bookmarkeditorimpl.h"
  
  class XMLElement;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox/konq-embed/src/bookmarkeditorimpl.cc
 --- kdenox/konq-embed/src/bookmarkeditorimpl.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarkeditorimpl.cc	2007-02-25 19:16:40.000000000 +1300
++++ kdenox/konq-embed/src/bookmarkeditorimpl.cc	2007-02-25 19:16:40.000000000 +1300
 @@ -23,12 +23,12 @@
  
  #include "bookmarkeditorimpl.h"
@@ -568,9 +568,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.c
  #include "bookmarks.h"
  #include "xmltree.h"
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox/konq-embed/src/bookmarks.cc
 --- kdenox/konq-embed/src/bookmarks.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarks.cc	2007-02-25 18:28:08.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.cc	2007-02-25 18:28:08.000000000 +1300
 @@ -24,6 +24,8 @@
  
  #if defined(ENABLE_BOOKMARKS)
@@ -588,9 +588,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_
  
  #include <klocale.h>
  #include <kstandarddirs.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox/konq-embed/src/bookmarks.h
 --- kdenox/konq-embed/src/bookmarks.h	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/bookmarks.h	2007-02-25 18:26:32.000000000 +1300
++++ kdenox/konq-embed/src/bookmarks.h	2007-02-25 18:26:32.000000000 +1300
 @@ -34,6 +34,8 @@
  
  #include <kurl.h>
@@ -600,9 +600,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_n
  class QPopupMenu;
  class XMLElement;
  class ActionMenu;
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox_new/konq-embed/src/mainwindow_qpe.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox/konq-embed/src/mainwindow_qpe.cc
 --- kdenox/konq-embed/src/mainwindow_qpe.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_qpe.cc	2007-02-25 17:46:32.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.cc	2007-02-25 17:46:32.000000000 +1300
 @@ -90,7 +90,7 @@
      return iconSet;
  }
@@ -621,9 +621,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kd
  {
      statusJustText( _msg, visible );
  }
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox/konq-embed/src/mainwindow_qpe.h
 --- kdenox/konq-embed/src/mainwindow_qpe.h	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_qpe.h	2007-02-25 17:47:23.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_qpe.h	2007-02-25 17:47:23.000000000 +1300
 @@ -39,6 +39,10 @@
  
  protected:
@@ -635,9 +635,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kde
  };
  
  #endif
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox/konq-embed/src/mainwindow_road.cc
 --- kdenox/konq-embed/src/mainwindow_road.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_road.cc	2007-02-25 20:32:12.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_road.cc	2007-02-25 20:32:12.000000000 +1300
 @@ -20,10 +20,11 @@
  
  #ifdef KONQ_GUI_ROAD
@@ -651,9 +651,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc k
  #include <qpopupmenu.h>
  #include <qtoolbar.h>
  #include <qaction.h>
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox_new/konq-embed/src/mainwindow_x11.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox/konq-embed/src/mainwindow_x11.cc
 --- kdenox/konq-embed/src/mainwindow_x11.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/mainwindow_x11.cc	2007-02-25 20:33:10.000000000 +1300
++++ kdenox/konq-embed/src/mainwindow_x11.cc	2007-02-25 20:33:10.000000000 +1300
 @@ -21,6 +21,8 @@
  
  // Implementation of the X11 GUI
@@ -663,9 +663,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kd
  #include "mainwindow_x11.h"
  #include "popupaction.h"
  
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox_new/konq-embed/src/roadtabbar.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox/konq-embed/src/roadtabbar.cc
 --- kdenox/konq-embed/src/roadtabbar.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/roadtabbar.cc	2007-02-25 17:44:19.000000000 +1300
++++ kdenox/konq-embed/src/roadtabbar.cc	2007-02-25 17:44:19.000000000 +1300
 @@ -18,6 +18,9 @@
      Boston, MA 02110-1301, USA.
  */
@@ -700,9 +700,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox
      // the caption may not exceed a given width, so shorten it if necessary
      // the following is inefficient, but clear, correct, and unlikely to be a bottleneck
      if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth )
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_new/konq-embed/src/roadtabbar.h
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox/konq-embed/src/roadtabbar.h
 --- kdenox/konq-embed/src/roadtabbar.h	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/roadtabbar.h	2007-02-25 17:42:40.000000000 +1300
++++ kdenox/konq-embed/src/roadtabbar.h	2007-02-25 17:42:40.000000000 +1300
 @@ -22,6 +22,9 @@
  #define __roadtabbar_h__
  
@@ -713,9 +713,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_
  
  struct RoadTabParams
  {
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox/konq-embed/src/run.cc
 --- kdenox/konq-embed/src/run.cc	2007-02-12 22:25:55.000000000 +1300
-+++ kdenox_new/konq-embed/src/run.cc	2007-02-25 17:34:35.000000000 +1300
++++ kdenox/konq-embed/src/run.cc	2007-02-25 17:34:35.000000000 +1300
 @@ -24,6 +24,7 @@
  #include "view.h"
  
@@ -733,9 +733,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/ko
  
              m_bFinished = true;
              emit error();
-diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp
+diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox/konq-embed/dropin/khtml/khtml_ext.cpp
 --- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp	2007-02-12 22:25:56.000000000 +1300
-+++ kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp	2007-02-24 03:38:24.000000000 +1300
++++ kdenox/konq-embed/dropin/khtml/khtml_ext.cpp	2007-02-24 03:38:24.000000000 +1300
 @@ -115,7 +115,8 @@
                                     const QString &filter, long cacheId,
                                     const QString & suggestedFilename, const QString& mimeType )
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
index 1f473117e9..cb84c96be1 100644
--- a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop
+++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop
@@ -2,5 +2,5 @@
 Exec=konqueror
 Icon=konqueror/konqueror
 Type=Application
-Name=konqueror
+Name=Konqueror
 Comment=Konqueror browser
diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.png b/packages/konqueror/konqueror-embedded-20070316/konqueror.png
index 879d470bbf..879d470bbf 100644
--- a/packages/konqueror/konqueror-embedded-20070212/konqueror.png
+++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.png
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070316.bb
index 3fb8a5cfa6..5a127515bb 100644
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ b/packages/konqueror/konqueror-embedded_20070316.bb
@@ -10,10 +10,11 @@ PR = "r5"
 
 inherit autotools
 
-SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \
+SRC_URI = "http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2 \
 	   file://dont-use-kde-config.patch;patch=1 \
            file://konqe_new_opie.patch;patch=1 \
-	   file://konqe-kapplication.patch;patch=1"
+	   file://konqe-kapplication.patch;patch=1 \
+           file://fix_configure.patch;patch=1"
 S = "${WORKDIR}/kdenox"
 
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"