contacts: added 0.4, unified recipes, fixed PV in svn version, disabled gnome-vfs

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1379 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 30 insertions, 21 deletions

diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc
new file mode 100644
index 0000000000..5fa493fab3
--- /dev/null
+++ b/meta/packages/pimlico/contacts.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Address-book application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ eds-dbus"
+RDEPENDS = "libedata-book"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+        install -d ${D}/${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+                ${datadir}/pixmaps/stock_person.png"
diff --git a/meta/packages/pimlico/contacts_0.4.bb b/meta/packages/pimlico/contacts_0.4.bb
new file mode 100644
index 0000000000..28e4cc29ce
--- /dev/null
+++ b/meta/packages/pimlico/contacts_0.4.bb
@@ -0,0 +1,5 @@
+require contacts.inc
+
+SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \
+           file://stock_contact.png \
+           file://stock_person.png"
diff --git a/meta/packages/pimlico/contacts_svn.bb b/meta/packages/pimlico/contacts_svn.bb
index 1674b80f99..7687210b52 100644
--- a/meta/packages/pimlico/contacts_svn.bb
+++ b/meta/packages/pimlico/contacts_svn.bb
@@ -1,29 +1,17 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ gnome-vfs eds-dbus"
-RDEPENDS = "gnome-vfs-plugin-file libedata-book"
-RRECOMMENDS = "gnome-vfs-plugin-http"
-DESCRIPTION = "Contacts is an address-book application."
-PR = "r5"
+require contacts.inc
 
-PV = "0.1+svn${SRCDATE}"
+#DEPENDS += "gnome-vfs"
+#RDEPENDS += "gnome-vfs-plugin-file"
+#RRECOMMENDS += "gnome-vfs-plugin-http"
+
+PV = "0.4+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://stock_contact.png \
            file://stock_person.png"
 
-inherit autotools pkgconfig
-
 S = "${WORKDIR}/trunk"
 
-EXTRA_OECONF = "--enable-gnome-vfs"
-
-do_install_append () {
-        install -d ${D}/${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
-                ${datadir}/pixmaps/stock_person.png"
-
+#EXTRA_OECONF = "--enable-gnome-vfs"