From: Marcin Juszkiewicz Date: Mon, 22 Aug 2005 10:33:14 +0000 (+0000) Subject: merge of 22ca4fd70d5673f7122ddd1ac0a7874b737c1dc6 X-Git-Tag: Release-2010-05/1~9453^2~3854^2~2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b89660bcbeba3e9ed542e0a84273f7f7fb433f;p=openembedded.git merge of 22ca4fd70d5673f7122ddd1ac0a7874b737c1dc6 and 3fdee15138882a8e7bbd364727e5c68a993ed862 --- f4b89660bcbeba3e9ed542e0a84273f7f7fb433f diff --cc packages/e17/e-wm_20050810.bb index ea93bfc3e2,b931751ec4..e0fa41311c --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@@ -25,9 -24,4 +25,9 @@@ EXTRA_OECONF = "--with-profile=${PROFIL --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d - } ++} diff --cc packages/ssmtp/ssmtp_2.61.bb index 425f7a607b,c48c48ae56..72cf7e63e4 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@@ -3,7 -3,7 +3,8 @@@ MAINTAINER = "Oyvind Repvik