merge of 8f7f4f1a6f08da91c5fe2312650063893394888b

     and f69ed55f40216d16d8f1cb7559d13b46385991b2

5 files changed, 14 insertions, 62 deletions

diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
deleted file mode 100644
index cce7301b38..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r1"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	   file://bluez-pin-gpe.glade"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
-do_install_append() {
-install -d ${D}${datadir}/bluez-pin
-install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/
-
-}
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
deleted file mode 100644
index bc79545182..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-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-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
new file mode 100644
index 0000000000..ce28d0b347
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -0,0 +1,14 @@
+LICENSE     = "GPL"
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR          = "r0"
+
+DEPENDS = "gtk+ libcontactsdb 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'