contacts: Update to 0.12 from git

Also fix the meta data, and add GPLv3 license for src/contacts-dbus.c

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index e86fd81f42a19dd37835b712c5ae171ad46a8471..54f55fc9ab444fcd918060077df0d21e83d438da 100644 (file)
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -26,7 +26,7 @@ SRCREV_pn-clutter-gtk-1.0 ??= "e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
 SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751"
 SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2"
 SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
-SRCREV_pn-contacts ??= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
+SRCREV_pn-contacts ??= "19853893fdb595de6aa59db0d9dc2f9451ed2933"
 SRCREV_pn-dates ??= "f8a6271eb45c4ec912466923c045fc960a4d894a"
 SRCREV_pn-dbus-wait ??= "402"
 SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4"

diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc
index 1e960f241abe0ee4724100afc5f1b9d429a0859b..a424295acad95fa77e384ae373712d01e3a6a21e 100644 (file)
--- a/meta/packages/pimlico/contacts.inc
+++ b/meta/packages/pimlico/contacts.inc
@@ -1,5 +1,8 @@
 DESCRIPTION = "Address-book application."
-LICENSE = "LGPL"
+HOMEPAGE = "http://pimlico-project.org/contacts.html"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "GPLv2 & GPLv2+ & GPLv3+ "
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ eds-dbus"
 DEPENDS_append_poky = " libowl"
@@ -25,4 +28,4 @@ FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
 SRC_URI = "file://stock_contact.png \
            file://stock_person.png"
 
-SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;patch=1 "
+SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;apply=yes "

diff --git a/meta/packages/pimlico/contacts_git.bb b/meta/packages/pimlico/contacts_git.bb
index 0e8aa3872230e50c6dc12992c873c3b0469a2191..bff4e288db4db18165f5b9e7e08ccb7c1cda03b6 100644 (file)
--- a/meta/packages/pimlico/contacts_git.bb
+++ b/meta/packages/pimlico/contacts_git.bb
@@ -1,7 +1,14 @@
 require contacts.inc
 
-PV = "0.9+git${SRCPV}"
-PR = "r1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \
+                    file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \
+                    file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
+
+PV = "0.12+git${SRCPV}"
+PR = "r0"
+
+S = "${WORKDIR}/git"
 
 SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"