[oe-commits] Stefan Schmidt : connman: Moved from moblin.org to kernel.org

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 24914241bb8e187092f781098e2aa4d040cb4eff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=24914241bb8e187092f781098e2aa4d040cb4eff

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Mon Mar 23 13:20:29 2009 +0100

connman: Moved from moblin.org to kernel.org

Conflicts:

	packages/connman/connman-gnome_0.4.bb
	packages/connman/connman_0.10.bb
	packages/connman/connman_0.8.bb
	packages/connman/connman_0.9.bb

---

 packages/connman/connman_0.10.bb |    4 ++++
 packages/connman/connman_git.bb  |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index 0fa2108..a220d88 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -30,7 +30,11 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
+<<<<<<< HEAD:packages/connman/connman_0.10.bb
   ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+=======
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+>>>>>>> 82e5731... connman: Moved from moblin.org to kernel.org:packages/connman/connman_0.10.bb
   file://connman \
 "
 
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index 7b7522f..3a04f5f 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,11 +1,11 @@
 require connman.inc
-PV = "0.8+gitr${SRCREV}"
-PR = "r1"
+PV = "0.12+gitr${SRCREV}"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
-  git://git.moblin.org/repos/projects/connman.git;protocol=http \
+  git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \
   file://connman \
 "
 S = "${WORKDIR}/git"