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

diff --git a/packages/pimlico/contacts_0.3.bb b/packages/pimlico/contacts.inc
similarity index 64%
rename from packages/pimlico/contacts_0.3.bb
rename to packages/pimlico/contacts.inc
index 799698b..5fa493f 100644 (file)
--- a/packages/pimlico/contacts_0.3.bb
+++ b/packages/pimlico/contacts.inc
@@ -1,19 +1,11 @@
+DESCRIPTION = "Address-book application."
 LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ eds-dbus"
 RDEPENDS = "libedata-book"
-DESCRIPTION = "Contacts is an address-book application."
-
-PR = "r1"
-
-SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \
-          file://stock_contact.png \
-          file://stock_person.png"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 do_install_append () {
        install -d ${D}/${datadir}/pixmaps
        install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
@@ -22,4 +14,3 @@ do_install_append () {
 
 FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
                ${datadir}/pixmaps/stock_person.png"
-

diff --git a/packages/pimlico/contacts_0.4.bb b/packages/pimlico/contacts_0.4.bb
new file mode 100644 (file)
index 0000000..28e4cc2
--- /dev/null
+++ b/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/packages/pimlico/contacts_svn.bb b/packages/pimlico/contacts_svn.bb
index bffa183..7687210 100644 (file)
--- a/packages/pimlico/contacts_svn.bb
+++ b/packages/pimlico/contacts_svn.bb
@@ -1,29 +1,17 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs"
-RDEPENDS = "gnome-vfs-plugin-file"
-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"