9 files changed, 63 insertions, 18 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass
index 59f2771027..9bac65fd9c 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -27,7 +27,8 @@ export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 #	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 #}
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
-FILES_${PN} = "${libdir}/lib*.so*"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
+FILES_${PN} += "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
-FILES_${PN}-dev += "${includedir}"
-\ No newline at end of file
+FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
+
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 9b0345a5b8..808bf2eaae 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -48,6 +48,5 @@ do_stage_append () {
 }
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}"
+FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
 FILES_${PN}-examples = "${bindir} ${datadir}"
-
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 631303b55b..a6c042333f 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -2,6 +2,8 @@
 
 # This script takes the last 1000 revs and writes a ChangeLog
 
+mkdir logs
+
 export REV_NOW=`mtn automate heads |head -n1`
 
 for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
@@ -9,22 +11,32 @@ for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${RE
         export AUTHOR=`echo $i | awk -F: '{print $1}'`
         export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : '  '{ print $2 }'`
         if test -n "${CL}"  ; then
-                echo "    ${CL}" >> ${AUTHOR}
+                echo "    ${CL}" >> logs/${AUTHOR}
         fi
 done
 
-for i in *@* ; do \
-        echo $i: >> ChangeLog
-        cat $i >> ChangeLog
-        echo >> ChangeLog
+cd logs
+for i in * ; do \
+        echo $i: >> ../ChangeLog
+        cat $i >> ../ChangeLog
+        echo >> ../ChangeLog
 done
+cd ..
+
+wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null
+
+wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null
 
-echo "Bug fixed:" >> ChangeLog
+NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`"
+RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`"
 
-wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O bugs.csv >& /dev/null
+echo -e "\n\nBugs fixed:" >> ChangeLog
+cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
 
-cat bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs opened:" >> ChangeLog
+cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
 
+echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog
 
-rm `ls | grep -v ChangeLog | grep -v mtn2cl`
+rm -Rf logs 
 
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/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/libxosd/files/use-sane-default-font.patch b/packages/libxosd/files/use-sane-default-font.patch
new file mode 100644
index 0000000000..26db249366
--- /dev/null
+++ b/packages/libxosd/files/use-sane-default-font.patch
@@ -0,0 +1,13 @@
+Index: current/src/libxosd/xosd.c
+===================================================================
+--- current.orig/src/libxosd/xosd.c
++++ current/src/libxosd/xosd.c
+@@ -26,7 +26,7 @@
+ #define XOFFSET 10
+ 
+ const char *osd_default_font =
+-  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
++  "fixed";
+ #if 0
+ "-adobe-helvetica-bold-r-*-*-10-*";
+ #endif
diff --git a/packages/libxosd/libxosd_svn.bb b/packages/libxosd/libxosd_svn.bb
index 055568cf4b..a184ca9074 100644
--- a/packages/libxosd/libxosd_svn.bb
+++ b/packages/libxosd/libxosd_svn.bb
@@ -3,10 +3,11 @@ SECTION = "libs/x11"
 DEPENDS = "virtual/libx11 libxext"
 LICENSE = "LGPL"
 PV = "2.2.15+svn${SRCDATE}"
-PR = "r0"
+PR = "r3"
 
 SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
-           file://autofoo.patch;patch=1"
+           file://autofoo.patch;patch=1 \
+           file://use-sane-default-font.patch;patch=1"
 S = "${WORKDIR}/current"
 
 inherit autotools binconfig
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"