From 8aa7fe1751f4e90781b7aa1b9237ad266001bd05 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 9 Jun 2005 21:40:16 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/09 23:39:20+02:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/06/09 23:36:12+02:00 dyndns.org!reenoo kaffe: - kaffe.inc: only add postinst/postrm for ${PN} packages. - kaffe-gtk: add xtst to DEPENDS. fixes bug #65. 2005/06/09 22:25:09+01:00 reciva.com!pb bash glibc_cvs around a bit BKrev: 42a8b740h3NJEoEEPrnA1UcuXPQd9Q --- packages/kaffe/kaffe-gtk_1.1.5.bb | 10 ++++++++++ packages/kaffe/kaffe-gtk_cvs.bb | 2 +- packages/kaffe/kaffe.inc | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'packages/kaffe') diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb index e69de29bb2..d4c2be9f5c 100644 --- a/packages/kaffe/kaffe-gtk_1.1.5.bb +++ b/packages/kaffe/kaffe-gtk_1.1.5.bb @@ -0,0 +1,10 @@ +MAINTAINER = "Rene Wagner " + +SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz" +S = "${WORKDIR}/kaffe-${PV}" + +include kaffe.inc + +DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native" + +EXTRA_OECONF += "" diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb index 840314ac4d..10b4adf506 100644 --- a/packages/kaffe/kaffe-gtk_cvs.bb +++ b/packages/kaffe/kaffe-gtk_cvs.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/kaffe" include kaffe.inc -DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib kaffeh-native" +DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native" EXTRA_OECONF += "" diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc index db913aee51..0cede21082 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -73,13 +73,13 @@ rmic \ rmiregistry \ serialver" -pkg_postinst() { +pkg_postinst_${PN} () { for name in ${alternative_names}; do update-alternatives --install ${bindir}/$name $name ${libdir}/${PN}/jre/bin/$name 300 done } -pkg_postrm() { +pkg_postrm_${PN} () { for name in ${alternative_names}; do update-alternatives --remove $name ${libdir}/${PN}/jre/bin/$name done -- cgit v1.2.3