merge of '33019e0e6235ec885c91256837a062fa55cae440'

     and 'a61aba8a057f0b182431d754bb7d4798c75ebd37'

15 files changed, 37 insertions, 13 deletions

diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index 8a08a6c1ce..f8e88a0217 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -1,8 +1,9 @@
 require classpath.inc
 
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
+PR = "r1"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+S = "${WORKDIR}/classpath-${PV}"
 
 inherit native
 
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index e66f5d7456..1d684c0557 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,6 +8,7 @@ RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
+           file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
 inherit autotools
diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc
index b1c4087989..64eb6bd143 100644
--- a/packages/gaim/pidgin.inc
+++ b/packages/gaim/pidgin.inc
@@ -63,6 +63,11 @@ python populate_packages_prepend () {
 			   description='Libpurple protocol plugin for %s',
 			   prepend=True, extra_depends='')
 
+	do_split_packages(d, purple, '^(ssl-.*)\.so$',
+                           output_pattern='libpurple-plugin-%s',
+                           description='libpurple plugin %s',
+                           prepend=True, extra_depends='libpurple-plugin-ssl')
+
         do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$',
                            output_pattern='libpurple-plugin-%s',
                            description='libpurple plugin %s',
diff --git a/packages/gaim/pidgin_2.0.1.bb b/packages/gaim/pidgin_2.0.1.bb
index 411b49ff4b..961467ad95 100644
--- a/packages/gaim/pidgin_2.0.1.bb
+++ b/packages/gaim/pidgin_2.0.1.bb
@@ -5,4 +5,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
            file://gconf-no-errors.patch;patch=1 \
 	  " 
 
-PR = "r2"
+PR = "r3"
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/intltool/intltool-native_0.35.5.bb b/packages/intltool/intltool-native_0.35.5.bb
new file mode 100644
index 0000000000..ba9b90c07a
--- /dev/null
+++ b/packages/intltool/intltool-native_0.35.5.bb
@@ -0,0 +1,9 @@
+require intltool_${PV}.bb
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc
index f4de1ff4aa..410a89cfa3 100644
--- a/packages/intltool/intltool.inc
+++ b/packages/intltool/intltool.inc
@@ -3,7 +3,8 @@ PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "GPL"
 
-SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2"
+URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
+SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
 S = "${WORKDIR}/intltool-${PV}"
 
 inherit autotools  pkgconfig
diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
new file mode 100644
index 0000000000..e13e376f12
--- /dev/null
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -0,0 +1,10 @@
+require intltool.inc
+
+DEPENDS = "libxml-parser-perl-native"
+#RDEPENDS = "libxml-parser-perl"
+
+PR = "r0"
+
+RRECOMMENDS = "perl-modules"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/jamvm/jamvm_1.4.2.bb b/packages/jamvm/jamvm_1.4.5.bb
index 489b4fb94b..489b4fb94b 100644
--- a/packages/jamvm/jamvm_1.4.2.bb
+++ b/packages/jamvm/jamvm_1.4.5.bb
diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
index a5e8b847c5..c9f40c8a5f 100644
--- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
+++ b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch
@@ -1,7 +1,5 @@
-diff --git a/devscripts/acinclude.m4.in.qt2 b/devscripts/acinclude.m4.in.qt2
-index 500e75f..e8d9758 100644
---- a/devscripts/acinclude.m4.in.qt2
-+++ b/devscripts/acinclude.m4.in.qt2
+--- ./acinclude.m4
++++ ./acinclude.m4
 @@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX],
    AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
  
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
+}