merge of '017bdeaa3b1e0331f3491b2ab736655e2a040771'

     and 'e64bb182478137ad27f3644e8be441efed8135ff'

6 files changed, 5 insertions, 6 deletions

diff --git a/packages/icewm/icewm-1.2.26/.mtn2git_empty b/packages/icewm/icewm-1.2.30/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/icewm/icewm-1.2.26/.mtn2git_empty
+++ b/packages/icewm/icewm-1.2.30/.mtn2git_empty
diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.30/configure.patch
index ade427d5e0..ade427d5e0 100644
--- a/packages/icewm/icewm-1.2.26/configure.patch
+++ b/packages/icewm/icewm-1.2.30/configure.patch
diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.30/makefile.patch
index 9473c9b2a9..9473c9b2a9 100644
--- a/packages/icewm/icewm-1.2.26/makefile.patch
+++ b/packages/icewm/icewm-1.2.30/makefile.patch
diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.30.bb
index 47d4fc8189..5266b0adb9 100644
--- a/packages/icewm/icewm_1.2.26.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -8,8 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
 	   file://configure.patch;patch=1"
 
-S = "${WORKDIR}/icewm-${PV}"
-
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc
index d21787786f..cb4ed12f8d 100644
--- a/packages/qt/qt-x11-free-common.inc
+++ b/packages/qt/qt-x11-free-common.inc
@@ -76,7 +76,7 @@ do_install() {
 }
 
 PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
-             qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig qt-x11-plugins-debug"
+             qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
 FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
 FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
 FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
@@ -84,4 +84,4 @@ FILES_qt-x11-designer = "${bindir}/designer"
 FILES_qt-x11-assistant = "${bindir}/assistant"
 FILES_qt-x11-qvfb = "${bindir}/qvfb"
 FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
-FILES_qt-x11-plugins-debug += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
+FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
diff --git a/packages/wrt/wrt-imagetools-native.bb b/packages/wrt/wrt-imagetools-native.bb
index cd5d802765..f9f459eea6 100644
--- a/packages/wrt/wrt-imagetools-native.bb
+++ b/packages/wrt/wrt-imagetools-native.bb
@@ -1,4 +1,5 @@
-SRC_URI = "cvs://anonymous@openwrt.org/openwrt;module=openwrt/target/utils/src;tag=TESTED"
+#SRC_URI = "svn://svn.openwrt.org/openwrt;module=trunk/tools/firmware-utils/src;proto=https"
+SRC_URI = ${SOURCEFORGE_MIRROR}/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2
 S = "${WORKDIR}/src/"
 
 inherit native
@@ -13,4 +14,4 @@ do_stage() {
 	install -m 0755 ${S}/trx ${STAGING_BINDIR}
 	install -m 0755 ${S}/motorola-bin ${STAGING_BINDIR}
 	install -m 0755 ${S}/addpattern ${STAGING_BINDIR}
-}
\ No newline at end of file
+}