summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-f6f10668ca5c0eed373f57559f03b9b65852e569.tar.gz
openembedded-core-f6f10668ca5c0eed373f57559f03b9b65852e569.tar.bz2
openembedded-core-f6f10668ca5c0eed373f57559f03b9b65852e569.tar.xz
openembedded-core-f6f10668ca5c0eed373f57559f03b9b65852e569.zip
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 0fbba06fa..78e5b7c54 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"
SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
+SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
SRCREV_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 a20942f3b..8e63005a8 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}"
PREFERRED_VERSION_hornsey ?= "1.0+git%"
SRCREV_pn-json-glib ?= "${AUTOREV}"
SRCREV_pn-libccss ?= "${AUTOREV}"
+SRCREV_pn-libjana ?= "${AUTOREV}"
SRCREV_pn-librest ?= "${AUTOREV}"
SRCREV_pn-libsocialweb ?= "${AUTOREV}"
PREFERRED_VERSION_libsocialweb ?= "0.0+git%"
diff --git a/meta-moblin/packages/libjana/libjana_svn.bb b/meta-moblin/packages/libjana/libjana_git.bb
index 49692b746..976e9adab 100644
--- a/meta-moblin/packages/libjana/libjana_svn.bb
+++ b/meta-moblin/packages/libjana/libjana_git.bb
@@ -1,13 +1,12 @@
DESCRIPTION = "O-Hand Jana Library"
-DEPENDS = "libmokojournal2"
-DEPENDS = "gtk+ eds-dbus gconf"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+DEPENDS = "gtk+ eds-dbus gconf"
+PV = "0.4.4+git${SRCPV}"
+PR = "r0"
inherit autotools_stage pkgconfig lib_package
-SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http"
-S = "${WORKDIR}/trunk/"
+SRC_URI = "git://git.gnome.org/jana;protocol=git"
+S = "${WORKDIR}/git/"
EXTRA_OECONF = "--enable-examples "
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 9477c3bcf..b96402038 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"
SRCREV_pn-dfu-util-native ?= "3139"
SRCREV_pn-dfu-util ?= "3139"
SRCREV_pn-libgsmd ?= "4335"
-SRCREV_pn-libjana ?= "749"
SRCREV_pn-libmokogsmd2 ?= "4334"
SRCREV_pn-libmokojournal2 ?= "3473"
SRCREV_pn-libmokopanelui2 ?= "3349"
@@ -250,6 +249,7 @@ SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
SRCREV_pn-libccss ?= "62697eb84fe190f9b8c65fcbaae10ec3d9edfffd"
+SRCREV_pn-libjana ?= "9ec1da8a534e87a83a6d729b48a41ca7b9cfb7b7"
SRCREV_pn-librest ?= "fe5048c92199afc9a7e9aef0add7f0e2b004bb47"
SRCREV_pn-libsocialweb ?= "cfad50252a4ad60f28b12d21e2fdb35db56984f5"
SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
index 503726546..22b4c38e5 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}"
SRCREV_pn-table ?= "${AUTOREV}"
SRCREV_pn-libmatchbox ?= "${AUTOREV}"
SRCREV_pn-tasks ?= "${AUTOREV}"
-SRCREV_pn-libjana = "${AUTOREV}"
-SRCREV_pn-mutter = "${AUTOREV}"
-SRCREV_pn-ofono = "${AUTOREV}"
+SRCREV_pn-mutter ?= "${AUTOREV}"
+SRCREV_pn-ofono ?= "${AUTOREV}"
SRCREV_pn-dri2proto = "${AUTOREV}"
#PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"