merge of 37095a40659e7e7112038308d6b630bd7a258bd5

     and e588b97112ee40d0ed224469b12043a82ffb1366

10 files changed, 92 insertions, 2 deletions

diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
new file mode 100644
index 0000000000..05850a872e
--- /dev/null
+++ b/packages/bluez/bluez-utils-nodbus_2.24.bb
@@ -0,0 +1,5 @@
+include bluez-utils.inc
+
+PR = "r0"
+
+EXTRA_OECONF += "--without-dbus"
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
new file mode 100644
index 0000000000..dc891e7598
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPL"
+DESCRIPTION = "GPE bluetooth support"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-mininet/gpe-mininet_0.6.bb b/packages/gpe-mininet/gpe-mininet_0.6.bb
new file mode 100644
index 0000000000..da95c97343
--- /dev/null
+++ b/packages/gpe-mininet/gpe-mininet_0.6.bb
@@ -0,0 +1,14 @@
+inherit autotools gpe pkgconfig
+
+PR = "r0"
+LICENSE = "GPL"
+DEPENDS = "libgpewidget gpe-icons gpe-conf"
+RRECOMMENDS = "gpe-conf"
+SECTION = "gpe"
+
+DESCRIPTION = "GPE network connection checker"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+FILES_${PN} = " ${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN} += " ${datadir}/gpe/pixmaps"
diff --git a/packages/gpe-taskmanager/gpe-taskmanager_0.19.bb b/packages/gpe-taskmanager/gpe-taskmanager_0.19.bb
new file mode 100644
index 0000000000..1f31a4d08a
--- /dev/null
+++ b/packages/gpe-taskmanager/gpe-taskmanager_0.19.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
+DEPENDS = "libgpewidget"
+SECTION = "gpe"
+
+DESCRIPTION = "GPE task manager"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
diff --git a/packages/libcontactsdb/libcontactsdb_0.3.bb b/packages/libcontactsdb/libcontactsdb_0.3.bb
new file mode 100644
index 0000000000..93950a3e1c
--- /dev/null
+++ b/packages/libcontactsdb/libcontactsdb_0.3.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Database access library for GPE contacts"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+PR = "r0"
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools gpe pkgconfig
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/libcontactsdb/libcontactsdb_cvs.bb b/packages/libcontactsdb/libcontactsdb_cvs.bb
index c6a8fad421..d11818b0bc 100644
--- a/packages/libcontactsdb/libcontactsdb_cvs.bb
+++ b/packages/libcontactsdb/libcontactsdb_cvs.bb
@@ -7,8 +7,8 @@ DEPENDS = "libgpewidget libgpepimc sqlite"
 LICENSE = "GPL"
 
 S = "${WORKDIR}/${PN}"
-PV = "0.1+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.3+cvs${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/libgpelaunch/libgpelaunch_0.14.bb b/packages/libgpelaunch/libgpelaunch_0.14.bb
new file mode 100644
index 0000000000..d2b6aa5c52
--- /dev/null
+++ b/packages/libgpelaunch/libgpelaunch_0.14.bb
@@ -0,0 +1,13 @@
+LICENSE = "LGPL"
+DESCRIPTION = "GPE program launcher library"
+SECTION = "libs"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ startup-notification"
+
+inherit autotools pkgconfig
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/startup-monitor/.mtn2git_empty b/packages/startup-monitor/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/startup-monitor/.mtn2git_empty
diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb
new file mode 100644
index 0000000000..cee61003b5
--- /dev/null
+++ b/packages/startup-monitor/startup-monitor_0.18-2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Startup notification support"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+DEPENDS = "x11 startup-notification glib-2.0 libmatchbox"
+
+inherit gpe pkgconfig 
+
+#SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${P}.tar.gz"
diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb
new file mode 100644
index 0000000000..a825ddf6de
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.5.bb
@@ -0,0 +1,11 @@
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+
+# we are using a gpe-style Makefile
+inherit gpe