[oe-commits] org.oe.dev contacts: added 0.4, unified recipes, fixed PV in svn version, disabled gnome-vfs (from Poky)

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 1c69dd15ef914f4029884dd5aefed613c261f351
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1c69dd15ef914f4029884dd5aefed613c261f351
Files:
1
packages/pimlico/contacts_0.3.bb
packages/pimlico/contacts_0.4.bb
packages/pimlico/contacts.inc
packages/pimlico/contacts_svn.bb
Diffs:

#
# mt diff -r02a6624c71727e9ca8fc9cb4497b838837b84379 -r1c69dd15ef914f4029884dd5aefed613c261f351
#
# 
# 
# rename "packages/pimlico/contacts_0.3.bb"
#     to "packages/pimlico/contacts_0.4.bb"
# 
# add_file "packages/pimlico/contacts.inc"
#  content [38562bb570c26dae7efe5495e05642d1e60d2401]
# 
# patch "packages/pimlico/contacts_0.4.bb"
#  from [5e4b6bb67ea2d4131cf93cedc4e9a0066ca62d27]
#    to [66b347c3844418209c135658ff6be9b558d018e3]
# 
# patch "packages/pimlico/contacts_svn.bb"
#  from [e58db632431846e231a58595a85ff8b371dd3991]
#    to [235a8abb5e9ef9ed32a7c269154b59e8682f6504]
# 
============================================================
--- packages/pimlico/contacts.inc	38562bb570c26dae7efe5495e05642d1e60d2401
+++ packages/pimlico/contacts.inc	38562bb570c26dae7efe5495e05642d1e60d2401
@@ -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"
============================================================
--- packages/pimlico/contacts_0.3.bb	5e4b6bb67ea2d4131cf93cedc4e9a0066ca62d27
+++ packages/pimlico/contacts_0.4.bb	66b347c3844418209c135658ff6be9b558d018e3
@@ -1,25 +1,5 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ eds-dbus"
-RDEPENDS = "libedata-book"
-DESCRIPTION = "Contacts is an address-book application."
+require contacts.inc
 
-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
-	install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
-}
-
-FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
-		${datadir}/pixmaps/stock_person.png"
-
============================================================
--- packages/pimlico/contacts_svn.bb	e58db632431846e231a58595a85ff8b371dd3991
+++ packages/pimlico/contacts_svn.bb	235a8abb5e9ef9ed32a7c269154b59e8682f6504
@@ -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"
-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"
-