8 files changed, 74 insertions, 6 deletions
diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 0e1e22e6d2..45dde3c14a 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r1"
+
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
@@ -14,4 +17,7 @@ do_install() {
 	install -m 0755 ${S}/build/lib* ${D}/${libdir}
 }
 
-
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}	
+}
diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb
new file mode 100644
index 0000000000..c16cbeb036
--- /dev/null
+++ b/packages/neuros-public/neuros-mainmenu_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1"
+SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755  ${S}/build/main-menu ${D}/${bindir}
+
+	install -d ${D}/${sysconfdir}/menu
+	install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu
+}
+
+
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
new file mode 100644
index 0000000000..6dbbd4cabd
--- /dev/null
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+	rm ${S}/src/Makefile || true
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755  ${S}/build/nwm ${D}/${bindir}
+}
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index d0de64d945..62a9d43fca 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
-PR = "r1"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c8.bb
index b7716d8cac..0bbf9c32fc 100644
--- a/packages/python/python-setuptools-native_0.6c8.bb
+++ b/packages/python/python-setuptools-native_0.6c8.bb
@@ -1,9 +1,9 @@
 require python-setuptools_${PV}.bb
 inherit native
 
+FILESPATH = "${FILE_DIRNAME}/python-setuptools"
 DEPENDS = "python-native"
 
 do_stage() {
-    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-      ${STAGING_BINDIR_NATIVE}/python setup.py install
+	distutils_stage_all
 }
diff --git a/packages/python/python-setuptools/.mtn2git_empty b/packages/python/python-setuptools/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-setuptools/.mtn2git_empty
diff --git a/packages/python/python-setuptools/fix-log-usage.patch b/packages/python/python-setuptools/fix-log-usage.patch
new file mode 100644
index 0000000000..6363c850c2
--- /dev/null
+++ b/packages/python/python-setuptools/fix-log-usage.patch
@@ -0,0 +1,13 @@
+Index: setuptools-0.6c8/setuptools/command/sdist.py
+===================================================================
+--- setuptools-0.6c8.orig/setuptools/command/sdist.py
++++ setuptools-0.6c8/setuptools/command/sdist.py
+@@ -95,7 +95,7 @@ def entries_finder(dirname, filename):
+         for match in entries_pattern.finditer(data):
+             yield joinpath(dirname,unescape(match.group(1)))
+     else:
+-        log.warn("unrecognized .svn/entries format in %s", dirname)
++        print ("unrecognized .svn/entries format in %s", dirname)
+ 
+ 
+ finders = [
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 19f73d3f67..5b82ecea69 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,9 +5,12 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml1"
 
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+  file://fix-log-usage.patch;patch=1 \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils