libjana: Use gnome git, not svn

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 0fbba06fa00059d0d91c8d00ec07ac0afce376d6..78e5b7c54ba07443030cd4ea3cae2af0149b9f6c 100644 (file)
--- 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 a20942f3be0de6f00931431fd9c15dd6904e1aa9..8e63005a8c660e7901d00f87a0744fac1ca075c9 100644 (file)
--- 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
similarity index 76%
rename from meta-moblin/packages/libjana/libjana_svn.bb
rename to meta-moblin/packages/libjana/libjana_git.bb
index 49692b74659348b4e58d16cfa1d04df39a2f8597..976e9adab3fb65e36a36d4b36a8d721a43af035e 100644 (file)
--- 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 9477c3bcfb9a6213f51e92f533e6182ec88aa61f..b96402038450112bd01bf7cdd68a6f97f3ccd145 100644 (file)
--- 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 503726546554e325ca796a7a1ed2817aca831bfa..22b4c38e5bc94dec90062a56bec704218d3fdf74 100644 (file)
--- 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}"