summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-04 17:31:58 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-04 17:31:58 +0000
commitf6f10668ca5c0eed373f57559f03b9b65852e569 (patch)
treeef97d66c2a89abb522196dc50c15597e89639c90
parent422c5f7c6af5eb5678aa3699399fec6c4b503914 (diff)
downloadpoky-f6f10668ca5c0eed373f57559f03b9b65852e569.tar.gz
libjana: Use gnome git, not svn
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc1
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc1
-rw-r--r--meta-moblin/packages/libjana/libjana_git.bb (renamed from meta-moblin/packages/libjana/libjana_svn.bb)11
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/conf/distro/include/poky-floating-revisions.inc5
5 files changed, 10 insertions, 10 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 0fbba06fa0..78e5b7c54b 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -65,6 +65,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
65SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" 65SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
66SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" 66SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
67SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" 67SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
68SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
68SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" 69SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
69SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" 70SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
70SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" 71SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index a20942f3be..8e63005a8c 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -32,6 +32,7 @@ SRCREV_pn-hornsey ?= "${AUTOREV}"
32PREFERRED_VERSION_hornsey ?= "1.0+git%" 32PREFERRED_VERSION_hornsey ?= "1.0+git%"
33SRCREV_pn-json-glib ?= "${AUTOREV}" 33SRCREV_pn-json-glib ?= "${AUTOREV}"
34SRCREV_pn-libccss ?= "${AUTOREV}" 34SRCREV_pn-libccss ?= "${AUTOREV}"
35SRCREV_pn-libjana ?= "${AUTOREV}"
35SRCREV_pn-librest ?= "${AUTOREV}" 36SRCREV_pn-librest ?= "${AUTOREV}"
36SRCREV_pn-libsocialweb ?= "${AUTOREV}" 37SRCREV_pn-libsocialweb ?= "${AUTOREV}"
37PREFERRED_VERSION_libsocialweb ?= "0.0+git%" 38PREFERRED_VERSION_libsocialweb ?= "0.0+git%"
diff --git a/meta-moblin/packages/libjana/libjana_svn.bb b/meta-moblin/packages/libjana/libjana_git.bb
index 49692b7465..976e9adab3 100644
--- a/meta-moblin/packages/libjana/libjana_svn.bb
+++ b/meta-moblin/packages/libjana/libjana_git.bb
@@ -1,13 +1,12 @@
1DESCRIPTION = "O-Hand Jana Library" 1DESCRIPTION = "O-Hand Jana Library"
2DEPENDS = "libmokojournal2" 2DEPENDS = "gtk+ eds-dbus gconf"
3DEPENDS = "gtk+ eds-dbus gconf" 3PV = "0.4.4+git${SRCPV}"
4PV = "0.1.0+svnr${SRCREV}" 4PR = "r0"
5PR = "r5"
6 5
7inherit autotools_stage pkgconfig lib_package 6inherit autotools_stage pkgconfig lib_package
8 7
9SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http" 8SRC_URI = "git://git.gnome.org/jana;protocol=git"
10S = "${WORKDIR}/trunk/" 9S = "${WORKDIR}/git/"
11 10
12EXTRA_OECONF = "--enable-examples " 11EXTRA_OECONF = "--enable-examples "
13 12
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 9477c3bcfb..b964020384 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -124,7 +124,6 @@ SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
124SRCREV_pn-dfu-util-native ?= "3139" 124SRCREV_pn-dfu-util-native ?= "3139"
125SRCREV_pn-dfu-util ?= "3139" 125SRCREV_pn-dfu-util ?= "3139"
126SRCREV_pn-libgsmd ?= "4335" 126SRCREV_pn-libgsmd ?= "4335"
127SRCREV_pn-libjana ?= "749"
128SRCREV_pn-libmokogsmd2 ?= "4334" 127SRCREV_pn-libmokogsmd2 ?= "4334"
129SRCREV_pn-libmokojournal2 ?= "3473" 128SRCREV_pn-libmokojournal2 ?= "3473"
130SRCREV_pn-libmokopanelui2 ?= "3349" 129SRCREV_pn-libmokopanelui2 ?= "3349"
@@ -250,6 +249,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
250SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a" 249SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
251SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495" 250SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
252SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd" 251SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
252SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
253SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47" 253SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
254SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5" 254SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
255SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" 255SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
index 5037265465..22b4c38e5b 100644
--- a/meta/conf/distro/include/poky-floating-revisions.inc
+++ b/meta/conf/distro/include/poky-floating-revisions.inc
@@ -55,9 +55,8 @@ SRCREV_pn-clutter-cairo ?= "${AUTOREV}"
55SRCREV_pn-table ?= "${AUTOREV}" 55SRCREV_pn-table ?= "${AUTOREV}"
56SRCREV_pn-libmatchbox ?= "${AUTOREV}" 56SRCREV_pn-libmatchbox ?= "${AUTOREV}"
57SRCREV_pn-tasks ?= "${AUTOREV}" 57SRCREV_pn-tasks ?= "${AUTOREV}"
58SRCREV_pn-libjana = "${AUTOREV}" 58SRCREV_pn-mutter ?= "${AUTOREV}"
59SRCREV_pn-mutter = "${AUTOREV}" 59SRCREV_pn-ofono ?= "${AUTOREV}"
60SRCREV_pn-ofono = "${AUTOREV}"
61 60
62SRCREV_pn-dri2proto = "${AUTOREV}" 61SRCREV_pn-dri2proto = "${AUTOREV}"
63#PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" 62#PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"