Remove leafpad icon, and use an icon from the icon theme instead

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

3 files changed, 4 insertions, 7 deletions

diff --git a/meta/packages/leafpad/files/leafpad.desktop b/meta/packages/leafpad/files/leafpad.desktop
index 0e582794ea..b3a65c467d 100644
--- a/meta/packages/leafpad/files/leafpad.desktop
+++ b/meta/packages/leafpad/files/leafpad.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Notes
 Exec=/usr/bin/leafpad
-Icon=leafpad.png
+Icon=accessories-text-editor
 Terminal=false
 Type=Application
 Categories=Utility;PIM;
diff --git a/meta/packages/leafpad/files/leafpad.png b/meta/packages/leafpad/files/leafpad.png
deleted file mode 100644
index c5ee0cff85..0000000000
--- a/meta/packages/leafpad/files/leafpad.png
+++ /dev/null
diff --git a/meta/packages/leafpad/leafpad_0.8.9.bb b/meta/packages/leafpad/leafpad_0.8.9.bb
index 1b1d23fa2a..f8e8e3bd5c 100644
--- a/meta/packages/leafpad/leafpad_0.8.9.bb
+++ b/meta/packages/leafpad/leafpad_0.8.9.bb
@@ -1,9 +1,8 @@
 LICENSE = "GPLv2"
 DEPENDS = "gtk+ intltool-native"
 SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
-           file://leafpad.desktop \
-           file://leafpad.png"
-PR = "r1"
+           file://leafpad.desktop"
+PR = "r2"
 
 inherit autotools pkgconfig
 
@@ -12,10 +11,8 @@ EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print"
 do_install_append () {
         install -d ${D}/${datadir}
         install -d ${D}/${datadir}/applications
-        install -d ${D}/${datadir}/pixmaps/
 
-        install -m 0644 ${WORKDIR}/leafpad.png ${D}/${datadir}/pixmaps
         install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
 }
 
-FILES_${PN} += "${datadir}/applications/leafpad.desktop ${datadir}/pixmaps/leafpad.png"
+FILES_${PN} += "${datadir}/applications/leafpad.desktop"