merge of 'd2f1a9f3ef64d23cec1e794848e1bb2ac1a92e63'

     and 'ed4e5b420b127a2a4f722c324c8c61ee00caf977'

4 files changed, 54 insertions, 2 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"