merge of '38fe196c64aa6b2afd09cdb99be2946bea1525fe'

     and 'adaa9b640ea26a4d78d99bcb88d2c7562a138c25'

18 files changed, 33 insertions, 14 deletions

diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
new file mode 100644
index 0000000000..12a1c4ce86
--- /dev/null
+++ b/packages/e17/expedite_cvs.bb
@@ -0,0 +1,14 @@
+inherit e
+
+DEPENDS = "evas-x11"
+
+PV = "0.0+cvs${SRCDATE}"
+
+SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
+
+S = "${WORKDIR}/${PN}"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index e39aa4018b..315cdbd160 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,4 +1,4 @@
-LICENSE = "GPL/LGPL"
+LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt"
 
 PR = "r0"
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index f190a5ae13..86a36c4bd7 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,4 +1,4 @@
-LICENSE = "GPL/LGPL"
+LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt"
 
 PR = "r1"
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index e73a0e206d..979c1ce305 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.konqueror.org/embedded"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 DEPENDS = "libqpe-opie openssl libpcre"
-LICENSE = "LGPL/GPL"
+LICENSE = "LGPL GPL"
 PR = "r5"
 
 # Note if this .bb files fails with the error:
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 159b6dd625..9acfc71204 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
-LICENSE = "LGPL/GPL"
+LICENSE = "LGPL GPL"
 PR = "r3"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070212.bb
index 0c2107bf79..912597c223 100644
--- a/packages/konqueror/konqueror-embedded_20070212.bb
+++ b/packages/konqueror/konqueror-embedded_20070212.bb
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
-LICENSE = "LGPL/GPL"
+LICENSE = "LGPL GPL"
 PR = "r4"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb
index 7a82863075..40654295f9 100644
--- a/packages/maemo/hildon-fm_0.9.1-2.bb
+++ b/packages/maemo/hildon-fm_0.9.1-2.bb
@@ -1,5 +1,5 @@
 PR 	= 	"r1"
-LICENSE =	"GPL/LGPL"
+LICENSE =	"GPL LGPL"
 
 DEPENDS =	"gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect"
 SRC_URI = 	"http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz"
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 834192ad0f..9c29926100 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
 SECTION = "x11/network"
-LICENSE = "MPL/GPL/LGPL"
+LICENSE = "MPL GPL LGPL"
 HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
 PRIORITY = "optional"
 
diff --git a/packages/ntpclient/ntpclient_2003_194.bb b/packages/ntpclient/ntpclient_2003_194.bb
index 52143baee0..84304334e5 100644
--- a/packages/ntpclient/ntpclient_2003_194.bb
+++ b/packages/ntpclient/ntpclient_2003_194.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://doolittle.icarus.com/ntpclient"
 AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>"
 RDEPENDS = "busybox"
 SECTION = "admin"
-LICENSE = "GPL/v2"
+LICENSE = "GPLv2"
 PR = "r1"
 # The ntpclient package uses version numbers that include an underscore :(
 PV = "2003_194"
diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb
index 4e6446f96a..caa70363a2 100644
--- a/packages/openmoko-base/openmoko-libs_svn.bb
+++ b/packages/openmoko-base/openmoko-libs_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
 SECTION = "openmoko/libs"
 LICENSE = "LGPL"
-DEPENDS += "gtk+ eds-dbus libgsmd"
+DEPENDS += "gtk+ eds-dbus libgsmd libxosd"
 PV = "0.0.1+svn${SRCDATE}"
 PR = "r5"
 
diff --git a/packages/opensync/libopensync_svn.bb b/packages/opensync/libopensync_svn.bb
index ac7da051c8..67501cc6e9 100644
--- a/packages/opensync/libopensync_svn.bb
+++ b/packages/opensync/libopensync_svn.bb
@@ -4,6 +4,8 @@ DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
 PV = "0.22+svn${SRCDATE}"
 SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit autotools pkgconfig lib_package
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/schroedinger/schroedinger_0.2.0.0.bb b/packages/schroedinger/schroedinger_0.2.0.0.bb
index 7812f30da7..78653783d9 100644
--- a/packages/schroedinger/schroedinger_0.2.0.0.bb
+++ b/packages/schroedinger/schroedinger_0.2.0.0.bb
@@ -1,5 +1,5 @@
 HOMEPAGE = "http://schrodinger.sourceforge.net/"
-LICENSE = "MPL/GPL/LGPL and MIT"
+LICENSE = "MPL GPL LGPL MIT"
 DEPENDS = "liboil gstreamer gst-plugins-base"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/schrodinger/${P}.tar.gz"
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index e49ebb5549..775fed148f 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util-0.9.12 neon"
-LICENSE = "Apache/BSD"
+LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 PR = "r1"
 
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index a608aac063..59f42b8c66 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util neon"
 RDEPENDS = "neon"
-LICENSE = "Apache/BSD"
+LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 PR = "r1"
 
diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb
index 1b73017d25..9674329f6c 100644
--- a/packages/subversion/subversion_1.4.3.bb
+++ b/packages/subversion/subversion_1.4.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util neon"
 RDEPENDS = "neon"
-LICENSE = "Apache/BSD"
+LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
 PR = "r1"
diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb
index 653056e193..e77d24d819 100644
--- a/packages/uim/uim-native_1.3.1.bb
+++ b/packages/uim/uim-native_1.3.1.bb
@@ -1,5 +1,6 @@
 require uim.inc
 DEPENDS = "gtk+ anthy intltool-native"
 inherit native autotools pkgconfig
+PR = "r1"
 
 S = "${WORKDIR}/uim-${PV}"
diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc
index 94eb11d332..41cdc860c6 100644
--- a/packages/uim/uim.inc
+++ b/packages/uim/uim.inc
@@ -14,3 +14,5 @@ EXTRA_OECONF += "--disable-applet \
                  --without-eb"
 
 SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2"
+
+FILES-${PN}-dbg += "${libdir}/*/*/immodules/.debug"
diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb
index e5ddcd0737..39d52b7fa2 100644
--- a/packages/uim/uim_1.3.1.bb
+++ b/packages/uim/uim_1.3.1.bb
@@ -1,7 +1,7 @@
 require uim.inc
 DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
 SECTION_uim-gtk2.0 = "x11/inputmethods"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://uim-module-manager.patch;patch=1"