From f6f10668ca5c0eed373f57559f03b9b65852e569 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 Feb 2010 17:31:58 +0000 Subject: libjana: Use gnome git, not svn Signed-off-by: Richard Purdie --- .../conf/distro/include/moblin-fixed-revisions.inc | 1 + .../distro/include/moblin-floating-revisions.inc | 1 + meta-moblin/packages/libjana/libjana_git.bb | 27 +++++++++++++++++++++ meta-moblin/packages/libjana/libjana_svn.bb | 28 ---------------------- meta/conf/distro/include/poky-fixed-revisions.inc | 2 +- .../distro/include/poky-floating-revisions.inc | 5 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 meta-moblin/packages/libjana/libjana_git.bb delete mode 100644 meta-moblin/packages/libjana/libjana_svn.bb 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_git.bb b/meta-moblin/packages/libjana/libjana_git.bb new file mode 100644 index 000000000..976e9adab --- /dev/null +++ b/meta-moblin/packages/libjana/libjana_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "O-Hand Jana Library" +DEPENDS = "gtk+ eds-dbus gconf" +PV = "0.4.4+git${SRCPV}" +PR = "r0" + +inherit autotools_stage pkgconfig lib_package + +SRC_URI = "git://git.gnome.org/jana;protocol=git" +S = "${WORKDIR}/git/" + +EXTRA_OECONF = "--enable-examples " + +do_configure_prepend() { + touch gtk-doc.make +} + +PACKAGES =+ "libjana-ecal libjana-ecal-dbg \ + libjana-gtk libjana-gtk-dbg \ + " + +LEAD_SONAME = "libjana.so" + +FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*" +FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*" +FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf" +FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*" +FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png " diff --git a/meta-moblin/packages/libjana/libjana_svn.bb b/meta-moblin/packages/libjana/libjana_svn.bb deleted file mode 100644 index 49692b746..000000000 --- a/meta-moblin/packages/libjana/libjana_svn.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "O-Hand Jana Library" -DEPENDS = "libmokojournal2" -DEPENDS = "gtk+ eds-dbus gconf" -PV = "0.1.0+svnr${SRCREV}" -PR = "r5" - -inherit autotools_stage pkgconfig lib_package - -SRC_URI = "svn://svn.gnome.org/svn/jana/;module=trunk;proto=http" -S = "${WORKDIR}/trunk/" - -EXTRA_OECONF = "--enable-examples " - -do_configure_prepend() { - touch gtk-doc.make -} - -PACKAGES =+ "libjana-ecal libjana-ecal-dbg \ - libjana-gtk libjana-gtk-dbg \ - " - -LEAD_SONAME = "libjana.so" - -FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*" -FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*" -FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf" -FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*" -FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png " 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}" -- cgit v1.2.3