Fix contacts icons once and for all?

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

1 files changed, 7 insertions, 15 deletions

diff --git a/openembedded/packages/contacts/contacts_svn.bb b/openembedded/packages/contacts/contacts_svn.bb
index cf86bffd1f..2783a48b97 100755
--- a/openembedded/packages/contacts/contacts_svn.bb
+++ b/openembedded/packages/contacts/contacts_svn.bb
@@ -5,14 +5,13 @@ RDEPENDS = "gnome-vfs-plugin-file"
 RRECOMMENDS = "gnome-vfs-plugin-http"
 MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DESCRIPTION = "Contacts is an address-book application."
-PR = "r4"
+PR = "r5"
 
 PV = "0.1+svn-${CVSDATE}"
 
 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,18 +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/stock/*/*.png \
-                ${datadir}/icons/hicolor/index.theme"
-
-pkg_postinst_${PN} () {
-        gtk-update-icon-cache $D/usr/share/icons/hicolor
-}
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+                ${datadir}/pixmaps/stock_person.png"