[oe-commits] : leafpad: update to 0.8.15

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.stable
Commit: 3ac107c8bd65ca4a6743602063ee7a6ce17f169a
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=3ac107c8bd65ca4a6743602063ee7a6ce17f169a

Author:  <xjqian at openembedded.org>
Date:   Sun Sep 21 20:00:01 2008 +0000

leafpad: update to 0.8.15
Acked by Koen and xjqian
plucked revisions from dev
ef94a9da05b275966f7d620f40148a66c7db9255
a6623e0286a380a4c6f44d4161e8a52d5e375c2b
7a85328b5be4ef73e617875e3f12b14372c77624
applied changes from ece831b8effd1793e3bd2ec7025ec5a6a9844225
             through 7a85328b5be4ef73e617875e3f12b14372c77624
applied changes from 1396a89d94593d73f0e66eafe0fca703ea5ca702
             through a6623e0286a380a4c6f44d4161e8a52d5e375c2b
applied changes from a6623e0286a380a4c6f44d4161e8a52d5e375c2b
             through ef94a9da05b275966f7d620f40148a66c7db9255
applied changes from c01723e9daa005435c1b1677732e22048a24b0d6
             through a61ed678ae87581b73d566bd9741a7098ecb1e69

---

 .../include/angstrom-2007-preferred-versions.inc   |    2 +-
 packages/leafpad/leafpad_0.8.15.bb                 |   19 ++++++++++++++++++
 packages/leafpad/leafpad_0.8.9.bb                  |   21 --------------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index d76479e..d649b54 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -780,7 +780,7 @@ PREFERRED_VERSION_lame ?= "3.96.1"
 PREFERRED_VERSION_lbreakout2 ?= "2.6beta"
 PREFERRED_VERSION_lcdproc ?= "0.5.1"
 PREFERRED_VERSION_lcms ?= "1.15"
-PREFERRED_VERSION_leafpad ?= "0.8.9"
+PREFERRED_VERSION_leafpad ?= "0.8.15"
 PREFERRED_VERSION_led ?= "0.0cvs20060814"
 PREFERRED_VERSION_lemon ?= "3.3.5"
 PREFERRED_VERSION_lemon-native ?= "3.3.5"
diff --git a/packages/leafpad/leafpad_0.8.15.bb b/packages/leafpad/leafpad_0.8.15.bb
new file mode 100644
index 0000000..9017c11
--- /dev/null
+++ b/packages/leafpad/leafpad_0.8.15.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GTK+ based simple text editor"
+DESCRIPTION_${PN}-icons = "Extra icon files for leafpad text editor"
+HOMEPAGE = "http://tarot.freeshell.org/leafpad"
+AUTHOR = "Tarot Osuji <tarot at sdf.lonestar.org>"
+SECTION = "x11/applications"
+LICENSE = "GPLv2"
+DEPENDS = "gtk+ intltool-native"
+SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print"
+
+PACKAGES =+ "${PN}-icons"
+
+FILES_${PN}-icons = "${datadir}/icons"
+FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons"
diff --git a/packages/leafpad/leafpad_0.8.9.bb b/packages/leafpad/leafpad_0.8.9.bb
deleted file mode 100644
index 1b1d23f..0000000
--- a/packages/leafpad/leafpad_0.8.9.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-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"
-
-inherit autotools pkgconfig
-
-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"