merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'

     and '5aa52a23ca3ba7054d5e294b0347d5f5e02dc077'

24 files changed, 70 insertions, 147 deletions

diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb
deleted file mode 100644
index 663b639b3d..0000000000
--- a/packages/libmikey/libmikey0_svn.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-PV = "0.3.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
-DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmutil0 openssl"
-DEFAULT_PREFERENCE = "-1"
-
-
-inherit autotools
-
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmikey"
-S = "${WORKDIR}/libmikey"
-
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
-
-do_stage() {
-	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/libmikey
-	install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
-}
diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb
deleted file mode 100644
index a8e156bc13..0000000000
--- a/packages/libmnetutil/libmnetutil0_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-PV = "0.2.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
-DESCRIPTION = "Networking class library for C++ programming"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmutil0 openssl"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil"
-S="${WORKDIR}/libmnetutil"
-
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
-
-do_stage() {
-	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/libmnetutil
-	install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
-}
diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb
deleted file mode 100644
index 4418757ba2..0000000000
--- a/packages/libmsip/libmsip0_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-PV = "0.2.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
-DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libmnetutil0 libmutil0"
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmsip"
-S="${WORKDIR}/libmsip"
-
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
-
-do_stage() {
-	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/libmsip
-	install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
-}
diff --git a/packages/minisip/libmikey_svn.bb b/packages/minisip/libmikey_svn.bb
new file mode 100644
index 0000000000..c51e466f9c
--- /dev/null
+++ b/packages/minisip/libmikey_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+PV = "0.3.2+svn${SRCDATE}"
+LICENSE = "LGPL"
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmikey"
+S = "${WORKDIR}/libmikey"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/minisip/libmnetutil_svn.bb b/packages/minisip/libmnetutil_svn.bb
new file mode 100644
index 0000000000..a2a60ba930
--- /dev/null
+++ b/packages/minisip/libmnetutil_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Networking class library for C++ programming"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
+PRIORITY = "optional"
+DEPENDS = "libmutil0 openssl"
+PV = "0.2.2+svn${SRCDATE}"
+LICENSE = "LGPL"
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmnetutil"
+S = "${WORKDIR}/libmnetutil"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/minisip/libmsip_svn.bb b/packages/minisip/libmsip_svn.bb
new file mode 100644
index 0000000000..747cc49f0e
--- /dev/null
+++ b/packages/minisip/libmsip_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
+PRIORITY = "optional"
+DEPENDS = "libmnetutil0 libmutil0"
+PV = "0.2.2+svn${SRCDATE}"
+LICENSE = "LGPL"
+
+inherit autotools
+
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmsip"
+S = "${WORKDIR}/libmsip"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/libmutil/libmutil0_svn.bb b/packages/minisip/libmutil0_svn.bb
index 8766d623e3..a7a20bdf00 100644
--- a/packages/libmutil/libmutil0_svn.bb
+++ b/packages/minisip/libmutil0_svn.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Class library implementing utilities for C++ programming"
+HOMEPAGE = "http://www.minisip.org"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
-
 DEPENDS = "openssl"
-
 PV = "0.3.1+svn${SRCDATE}"
 
 inherit autotools lib_package
@@ -13,8 +12,5 @@ SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmutil"
 S = "${WORKDIR}/libmutil"
 
 do_stage() {
-	oe_libinstall -a -so libmutil ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/libmutil
-	install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil
+	autotools_stage_all
 }
diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb
index 136f09e156..137f29f2d8 100644
--- a/packages/minisip/minisip-video_svn.bb
+++ b/packages/minisip/minisip-video_svn.bb
@@ -1,18 +1,13 @@
-PV = "0.6.2+svn${SRCDATE}"
+DESCRIPTION = "SIP user agent, with focus on security - video support"
 LICENSE = "GPL"
 SECTION = "x11/utils"
-PR = "r0"
+DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0"
 CONFLICTS = "minisip"
+PV = "0.6.2+svn${SRCDATE}"
 
-DESCRIPTION = "SIP user agent, with focus on security - video support"
-DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0"
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip"
 S = "${WORKDIR}/minisip"
 
-
-
-FILES_${PN} += "${datadir}/minisip"
-
 inherit autotools
 
 EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg"
@@ -23,3 +18,6 @@ do_install_append () {
 	install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
 	install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
 }
+
+FILES_${PN} += "${datadir}/minisip"
+
diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb
index 6928387ad0..9e9d426d84 100644
--- a/packages/minisip/minisip_svn.bb
+++ b/packages/minisip/minisip_svn.bb
@@ -1,28 +1,23 @@
-PV = "0.6.2+svn${SRCDATE}"
+DESCRIPTION = "SIP user agent, with focus on security"
+HOMEPAGE = "http://www.minisip.org"
+DEPENDS = "libglademm libmsip0 libmikey0"
 LICENSE = "GPL"
 SECTION = "x11/utils"
-PR = "r0"
+PV = "0.6.2+svn${SRCDATE}"
 
-DESCRIPTION = "SIP user agent, with focus on security"
-DEPENDS = "libglademm libmsip0 libmikey0"
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip"
 S = "${WORKDIR}/${PN}"
 
-DEFAULT_PREFERENCE="-1"
-
-FILES_${PN} += "${datadir}/minisip"
-
 inherit autotools
 
 EXTRA_OECONF = "--enable-ipaq"
 
-# do_configure_prepend() {
-#	./bootstrap
-#}
-
 do_install_append () {
 	install -d ${D}${datadir}/pixmaps
 	install -d ${D}${datadir}/applications
 	install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
 	install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
 }
+
+FILES_${PN} += "${datadir}/minisip"
+
diff --git a/packages/libmikey/.mtn2git_empty b/packages/nonworking/libmikey/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libmikey/.mtn2git_empty
+++ b/packages/nonworking/libmikey/.mtn2git_empty
diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/nonworking/libmikey/libmikey0_0.3.2.bb
index 214faef40f..214faef40f 100644
--- a/packages/libmikey/libmikey0_0.3.2.bb
+++ b/packages/nonworking/libmikey/libmikey0_0.3.2.bb
diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/nonworking/libmikey/libmikey_0.1a.bb
index e00ce25594..e00ce25594 100644
--- a/packages/libmikey/libmikey_0.1a.bb
+++ b/packages/nonworking/libmikey/libmikey_0.1a.bb
diff --git a/packages/libmnetutil/.mtn2git_empty b/packages/nonworking/libmnetutil/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libmnetutil/.mtn2git_empty
+++ b/packages/nonworking/libmnetutil/.mtn2git_empty
diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb
index a7866b35ec..a7866b35ec 100644
--- a/packages/libmnetutil/libmnetutil0_0.2.2.bb
+++ b/packages/nonworking/libmnetutil/libmnetutil0_0.2.2.bb
diff --git a/packages/libmsip/.mtn2git_empty b/packages/nonworking/libmsip/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libmsip/.mtn2git_empty
+++ b/packages/nonworking/libmsip/.mtn2git_empty
diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/nonworking/libmsip/libmsip0_0.2.2.bb
index 8d8bb905db..8d8bb905db 100644
--- a/packages/libmsip/libmsip0_0.2.2.bb
+++ b/packages/nonworking/libmsip/libmsip0_0.2.2.bb
diff --git a/packages/minisip/minisip_0.6.2.bb b/packages/nonworking/minisip/minisip_0.6.2.bb
index b85007deef..b85007deef 100644
--- a/packages/minisip/minisip_0.6.2.bb
+++ b/packages/nonworking/minisip/minisip_0.6.2.bb
diff --git a/packages/nonworking/minisip/minisip_1.0a.bb b/packages/nonworking/minisip/minisip_1.0a.bb
deleted file mode 100644
index 14ce425b0e..0000000000
--- a/packages/nonworking/minisip/minisip_1.0a.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Minisip is a SIP User Agent"
-SECTION = "opie/network"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "libmikey libopie1"
-
-SRC_URI = "http://minisip.org/source/minisip-0.1a.tar.gz"
-S = "${WORKDIR}/minisip-0.1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-qte --enable-opie"
-
diff --git a/packages/nonworking/nylon/.mtn2git_empty b/packages/nonworking/nylon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/nylon/.mtn2git_empty
diff --git a/packages/nylon/simple-firewall.bb b/packages/nonworking/nylon/simple-firewall.bb
index fc7c3de6a3..fc7c3de6a3 100644
--- a/packages/nylon/simple-firewall.bb
+++ b/packages/nonworking/nylon/simple-firewall.bb
diff --git a/packages/nonworking/redboot-utils/.mtn2git_empty b/packages/nonworking/redboot-utils/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/redboot-utils/.mtn2git_empty
diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/nonworking/redboot-utils/fis_1.0.bb
index d1170b6ba8..d1170b6ba8 100644
--- a/packages/redboot-utils/fis_1.0.bb
+++ b/packages/nonworking/redboot-utils/fis_1.0.bb
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 006948109f..96c027f3db 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,16 +1,14 @@
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r21"
 
-SRC_URI = "file://etc file://matchbox-session"
+SRC_URI = "file://etc"
 S = ${WORKDIR}
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
 	cp -R ${S}/etc ${D}/etc
 	rm -fR ${D}/etc/.svn
 	rm -fR ${D}/etc/matchbox/.svn
diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session
deleted file mode 100644
index 658ce4bcfc..0000000000
--- a/packages/openmoko2/openmoko-session2/matchbox-session
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1 
-
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-
-matchbox-desktop-2 &
-matchbox-panel-2  --orientation south &
-exec matchbox-window-manager $@