From 4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 12 Jan 2010 20:32:43 +0000
Subject: carrick: Add 1.1.13 release version and prefer over the git version
 for moblin

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../conf/distro/include/moblin-fixed-revisions.inc    |  3 +++
 .../conf/distro/include/moblin-floating-revisions.inc |  1 +
 meta-moblin/packages/carrick/carrick.inc              | 14 ++++++++++++++
 meta-moblin/packages/carrick/carrick_1.1.13.bb        |  1 +
 meta-moblin/packages/carrick/carrick_git.bb           | 19 +++----------------
 5 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 meta-moblin/packages/carrick/carrick.inc
 create mode 100644 meta-moblin/packages/carrick/carrick_1.1.13.bb

(limited to 'meta-moblin')

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index d5552fc48..f644c5176 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -19,6 +19,9 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1"
 PREFERRED_VERSION_libdrm ?= ""
 PREFERRED_VERSION_xf86-input-keyboard ?= ""
 PREFERRED_VERSION_dri2proto ?= ""
+PREFERRED_VERSION_carrick ?= "1.1.13"
+
+
 SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
 SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
 SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 3ac996df4..31ed13fd7 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -9,6 +9,7 @@ SRCREV_pn-bickley ?= "${AUTOREV}"
 SRCREV_pn-bisho ?= "${AUTOREV}"
 SRCREV_pn-bognor-regis ?= "${AUTOREV}"
 SRCREV_pn-carrick ?= "${AUTOREV}"
+PREFERRED_VERSION_carrick ?= "1.2.0+git%"
 SRCREV_pn-clutter ?= "${AUTOREV}"
 SRCREV_pn-clutter-1.0 ?= "${AUTOREV}"
 SRCREV_pn-clutter-gtk ?= "${AUTOREV}"
diff --git a/meta-moblin/packages/carrick/carrick.inc b/meta-moblin/packages/carrick/carrick.inc
new file mode 100644
index 000000000..f40aa26c4
--- /dev/null
+++ b/meta-moblin/packages/carrick/carrick.inc
@@ -0,0 +1,14 @@
+DESCIPTION = "Connection Management Panel Applet"
+SRC_URI = "http://download.moblin.org/sources/carrick/1.1/carrick-${PV}.tar.bz2"
+LICENSE = "GPLv2"
+
+DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
+RDEPENDS = "connman"
+
+FILES_${PN} += "${datadir}/icons/hicolor"
+
+inherit autotools_stage
+
+do_configure_prepend () {
+	mkdir -p ${S}/build/autotools
+}
diff --git a/meta-moblin/packages/carrick/carrick_1.1.13.bb b/meta-moblin/packages/carrick/carrick_1.1.13.bb
new file mode 100644
index 000000000..f7ec5c017
--- /dev/null
+++ b/meta-moblin/packages/carrick/carrick_1.1.13.bb
@@ -0,0 +1 @@
+include carrick.inc
diff --git a/meta-moblin/packages/carrick/carrick_git.bb b/meta-moblin/packages/carrick/carrick_git.bb
index 10b402c81..3258e052b 100644
--- a/meta-moblin/packages/carrick/carrick_git.bb
+++ b/meta-moblin/packages/carrick/carrick_git.bb
@@ -1,18 +1,5 @@
-DESCIPTION = "Connection Management Panel Applet"
-SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git"
-LICENSE = "GPLv2"
-PV = "0.0+git${SRCPV}"
-PR = "r1"
-
-DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
-RDEPENDS = "connman"
+include carrick.inc
 
+SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git"
+PV = "1.2.0+git${SRCPV}"
 S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/icons/hicolor"
-
-inherit autotools_stage
-
-do_configure_prepend () {
-	mkdir -p ${S}/build/autotools
-}
-- 
cgit v1.2.3