From 5a259420784ff07398e07e88a207c6d93f22b3c5 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas@openedhand.com>
Date: Tue, 10 Apr 2007 14:21:51 +0000
Subject: [PATCH] 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
---
 meta/packages/leafpad/files/leafpad.desktop |   2 +-
 meta/packages/leafpad/files/leafpad.png     | Bin 1950 -> 0 bytes
 meta/packages/leafpad/leafpad_0.8.9.bb      |   9 +++------
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 meta/packages/leafpad/files/leafpad.png

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 c5ee0cff85ab3dedab039592ca9ff90167b03567..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1950
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

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"
-- 
2.40.1