diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-06-25 16:32:47 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-30 13:11:26 +0100 |
commit | 75bd3e60ccb5e4c64b4c0d0e43b69b3de0475444 (patch) | |
tree | 55b6d9e652925d0fabdf1183dded6ba048cb4721 /meta | |
parent | fd32855dda35662c73ada19d4ec328aa5b13b221 (diff) | |
download | poky-75bd3e60ccb5e4c64b4c0d0e43b69b3de0475444.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
-rw-r--r-- | meta/packages/pimlico/contacts.inc | 7 | ||||
-rw-r--r-- | meta/packages/pimlico/contacts_git.bb | 11 |
3 files changed, 15 insertions, 5 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index e86fd81f42..54f55fc9ab 100644 --- 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" | |||
26 | SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751" | 26 | SRCREV_pn-clutter-mozembed ??= "738d017beb5579b2ff6e4d992d4889b61c974751" |
27 | SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" | 27 | SRCREV_pn-connman ??= "36e877dece72577a3ae6197eafd505d0e6e0c1d2" |
28 | SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4" | 28 | SRCREV_pn-connman-gnome ??= "b589f4f89bff20d54682cc6b49efa86feac8adb4" |
29 | SRCREV_pn-contacts ??= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25" | 29 | SRCREV_pn-contacts ??= "19853893fdb595de6aa59db0d9dc2f9451ed2933" |
30 | SRCREV_pn-dates ??= "f8a6271eb45c4ec912466923c045fc960a4d894a" | 30 | SRCREV_pn-dates ??= "f8a6271eb45c4ec912466923c045fc960a4d894a" |
31 | SRCREV_pn-dbus-wait ??= "402" | 31 | SRCREV_pn-dbus-wait ??= "402" |
32 | SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4" | 32 | SRCREV_pn-dri2proto ??= "66c56ab10d917e3f47f93178d7eac6430970d3c4" |
diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc index 1e960f241a..a424295aca 100644 --- a/meta/packages/pimlico/contacts.inc +++ b/meta/packages/pimlico/contacts.inc | |||
@@ -1,5 +1,8 @@ | |||
1 | DESCRIPTION = "Address-book application." | 1 | DESCRIPTION = "Address-book application." |
2 | LICENSE = "LGPL" | 2 | HOMEPAGE = "http://pimlico-project.org/contacts.html" |
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " | ||
3 | SECTION = "x11" | 6 | SECTION = "x11" |
4 | DEPENDS = "glib-2.0 gtk+ eds-dbus" | 7 | DEPENDS = "glib-2.0 gtk+ eds-dbus" |
5 | DEPENDS_append_poky = " libowl" | 8 | DEPENDS_append_poky = " libowl" |
@@ -25,4 +28,4 @@ FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ | |||
25 | SRC_URI = "file://stock_contact.png \ | 28 | SRC_URI = "file://stock_contact.png \ |
26 | file://stock_person.png" | 29 | file://stock_person.png" |
27 | 30 | ||
28 | SRC_URI_append_poky = " file://contacts-owl-window-menu.patch;patch=1 " | 31 | 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 0e8aa38722..bff4e288db 100644 --- a/meta/packages/pimlico/contacts_git.bb +++ b/meta/packages/pimlico/contacts_git.bb | |||
@@ -1,7 +1,14 @@ | |||
1 | require contacts.inc | 1 | require contacts.inc |
2 | 2 | ||
3 | PV = "0.9+git${SRCPV}" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
4 | PR = "r1" | 4 | file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \ |
5 | file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \ | ||
6 | file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" | ||
7 | |||
8 | PV = "0.12+git${SRCPV}" | ||
9 | PR = "r0" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
5 | 12 | ||
6 | SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" | 13 | SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" |
7 | 14 | ||