diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-03-23 11:30:30 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-03-23 11:30:30 +0000 |
| commit | 454c032f0c3053b9fdea6b666f4b60c17815d236 (patch) | |
| tree | de2096fa8e532f4c8802bc9e83b4561feea7fab4 /gnome-base | |
| parent | New version for GNOME-2.22. Removed hard dependency on esound. HIG and randr ... (diff) | |
| download | gentoo-2-454c032f0c3053b9fdea6b666f4b60c17815d236.tar.gz gentoo-2-454c032f0c3053b9fdea6b666f4b60c17815d236.tar.bz2 gentoo-2-454c032f0c3053b9fdea6b666f4b60c17815d236.zip | |
remove gnome.desktop which is now provided by gnome-session, fix bug #213118
(Portage version: 2.1.4.4)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-2.20.4.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 622e10f29036..ee5dbb368ca8 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gdm # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.265 2008/03/22 22:05:21 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.266 2008/03/23 11:30:30 eva Exp $ + + 23 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.20.4.ebuild: + remove gnome.desktop which is now provided by gnome-session, fix bug + #213118 *gdm-2.20.4 (22 Mar 2008) diff --git a/gnome-base/gdm/gdm-2.20.4.ebuild b/gnome-base/gdm/gdm-2.20.4.ebuild index 85eaeba7f9fd..c8f7316221ba 100644 --- a/gnome-base/gdm/gdm-2.20.4.ebuild +++ b/gnome-base/gdm/gdm-2.20.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.4.ebuild,v 1.2 2008/03/22 22:05:21 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.4.ebuild,v 1.3 2008/03/23 11:30:30 eva Exp $ inherit autotools eutils pam gnome2 @@ -105,9 +105,6 @@ src_unpack() { # Add gksu to gdmsetup menu entry epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch" - - # Fix compile errors - #epatch "${FILESDIR}/${PN}-2.20.3-logging.patch" } src_install() { @@ -138,6 +135,9 @@ src_install() { exeinto /etc/X11/dm/Sessions doexe "${gentoodir}/custom.desktop" + # avoid file collision, bug #213118 + rm -f "${D}/usr/share/xsessions/gnome.desktop" + # We replace the pam stuff by our own rm -rf "${D}/etc/pam.d" |