contacts: Sync with poky and fix icons issue

diff --git a/packages/contacts/contacts_0.1.bb b/packages/contacts/contacts_0.1.bb
index aff86a1..cf02525 100644 (file)
--- a/packages/contacts/contacts_0.1.bb
+++ b/packages/contacts/contacts_0.1.bb
@@ -3,30 +3,22 @@ SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN}/tags;module=release-0.1;proto=http \
           file://stock_contact.png \
-          file://stock_person.png \
-          file://index.theme"
+          file://stock_person.png"
 
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/release-0.1"
 
 do_install_append () {
-       install -d ${D}/${datadir}/icons/hicolor/48x48/stock/net
-       install -d ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-
-       install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/icons/hicolor/48x48/stock/net
-       install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-       install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor
+       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}/icons/hicolor/48x48/apps/oh-contacts.png \
-               ${datadir}/icons/hicolor/48x48/stock/*/*.png \
-               ${datadir}/icons/hicolor/index.theme"
-
-pkg_postinst_${PN} () {
-       gtk-update-icon-cache /usr/share/icons/hicolor
-}
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+               ${datadir}/pixmaps/stock_person.png"
 

diff --git a/packages/contacts/contacts_svn.bb b/packages/contacts/contacts_svn.bb
index f73c52f..cd4f6a7 100644 (file)
--- a/packages/contacts/contacts_svn.bb
+++ b/packages/contacts/contacts_svn.bb
@@ -3,16 +3,15 @@ SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus gnome-vfs"
 RDEPENDS = "gnome-vfs-plugin-file"
 RRECOMMENDS = "gnome-vfs-plugin-http"
-MAINTAINER = "Richard Purdie <richard@openedhand.com>"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
-PR = "r3"
+PR = "r5"
 
 PV = "0.1+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
           file://stock_contact.png \
-          file://stock_person.png \
-          file://index.theme"
+          file://stock_person.png"
 
 inherit autotools pkgconfig
 
@@ -21,19 +20,11 @@ S = "${WORKDIR}/trunk"
 EXTRA_OECONF = "--enable-gnome-vfs"
 
 do_install_append () {
-       install -d ${D}/${datadir}/icons/hicolor/48x48/stock/net
-       install -d ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-
-       install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/icons/hicolor/48x48/stock/net
-       install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/icons/hicolor/48x48/stock/generic
-       install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor
+       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}/icons/hicolor/48x48/apps/oh-contacts.png \
-               ${datadir}/icons/hicolor/48x48/stock/*/*.png \
-               ${datadir}/icons/hicolor/index.theme"
-
-pkg_postinst_${PN} () {
-       gtk-update-icon-cache /usr/share/icons/hicolor
-}
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+               ${datadir}/pixmaps/stock_person.png"