5 files changed, 29 insertions, 44 deletions
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
index cbc4010c32..1ad46dea9d 100644
--- a/packages/connman/connman.inc
+++ b/packages/connman/connman.inc
@@ -1,9 +1,8 @@
+DESCRIPTION = "The Moblin Connection Manager"
 HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
-SUMMARY  = "Moblin Connection Manager"
-LICENSE  = "GPL"
-
+SECTION = "libs/network"
+LICENSE = "GPL"
 DEPENDS  = "dbus glib-2.0"
-RDEPENDS = "dhcp-client wpa-supplicant resolvconf"
 
 EXTRA_OECONF += " \
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -18,6 +17,18 @@ do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
+python populate_packages_prepend() {
+	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
+	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
+	do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
+}
+
+RDEPENDS = "dhcp-client wpa-supplicant resolvconf"
+
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 PACKAGES += "${PN}-script-dhclient"
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
@@ -31,12 +42,3 @@ FILES_${PN}-script-dhclient += "${libdir}/connman/scripts/dhclient*"
 FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
                     ${libdir}/connman/scripts/.debug"
 
-python populate_packages_prepend() {
-	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
-	plugin_name = bb.data.expand('${PN}-plugin-%s', d)
-        do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' )
-}
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/packages/connman/connman_0.1.bb b/packages/connman/connman_0.1.bb
deleted file mode 100644
index c9eb90cab3..0000000000
--- a/packages/connman/connman_0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require connman.inc
-PR       = "r0"
-
-EXTRA_OECONF += " \
-	--disable-gtk-doc "
-
-SRC_URI  = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
-            file://connman "
-
diff --git a/packages/connman/connman_0.2.bb b/packages/connman/connman_0.2.bb
deleted file mode 100644
index c9eb90cab3..0000000000
--- a/packages/connman/connman_0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require connman.inc
-PR       = "r0"
-
-EXTRA_OECONF += " \
-	--disable-gtk-doc "
-
-SRC_URI  = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
-            file://connman "
-
diff --git a/packages/connman/connman_0.4.bb b/packages/connman/connman_0.4.bb
index c9eb90cab3..951b22cacd 100644
--- a/packages/connman/connman_0.4.bb
+++ b/packages/connman/connman_0.4.bb
@@ -1,9 +1,10 @@
 require connman.inc
-PR       = "r0"
+PR = "r0"
 
-EXTRA_OECONF += " \
-	--disable-gtk-doc "
+EXTRA_OECONF += "--disable-gtk-doc"
 
-SRC_URI  = "ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
-            file://connman "
+SRC_URI  = "\
+  ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  file://connman \
+"
 
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index f22125e16e..5791567e33 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,11 +1,11 @@
 require connman.inc
-PV       = "0.0+gitr${SRCREV}"
-PR       = "r4.02"
-PE       = "1"
-S        = "${WORKDIR}/git"
+PV = "0.0+gitr${SRCREV}"
+PR = "r5"
+PE = "1"
+S = "${WORKDIR}/git"
 
-DEPENDS  += "libgdbus hal"
+DEPENDS += "libgdbus hal"
 
-SRC_URI  = "git://git.moblin.org/repos/projects/connman.git;protocol=http \
-            file://use_nm_in_cross_compiling.patch;patch=1\
-            file://connman "
+SRC_URI = "git://git.moblin.org/repos/projects/connman.git;protocol=http \
+           file://use_nm_in_cross_compiling.patch;patch=1\
+           file://connman "