summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2008-10-21 14:19:58 +0000
committerRémi Cardona <remi@gentoo.org>2008-10-21 14:19:58 +0000
commitc00c85e8ee6c17775dd32563823a50be6b3b83f2 (patch)
treef2abb878887c518eeb917335c6beae611843a749 /x11-base
parentManifest. (diff)
downloadgentoo-2-c00c85e8ee6c17775dd32563823a50be6b3b83f2.tar.gz
gentoo-2-c00c85e8ee6c17775dd32563823a50be6b3b83f2.tar.bz2
gentoo-2-c00c85e8ee6c17775dd32563823a50be6b3b83f2.zip
x11-base/xorg-server: patch has been sent upstream, updating ebuild to reflect that
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog5
-rw-r--r--x11-base/xorg-server/xorg-server-1.5.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 87af9750ac61..ea1a92aaa287 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.362 2008/10/18 10:34:56 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.363 2008/10/21 14:19:58 remi Exp $
+
+ 21 Oct 2008; Rémi Cardona <remi@gentoo.org> xorg-server-1.5.2.ebuild:
+ patch has been sent upstream, updating ebuild to reflect that
18 Oct 2008; Rémi Cardona <remi@gentoo.org>
-files/1.5.2-force-LANG-C-when-running-awk-due-to-unintended-erro.patch,
diff --git a/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
index 9ffebbdd2375..66d6f4cd1c63 100644
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.2.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/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.4 2008/10/18 10:34:56 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.5 2008/10/21 14:19:58 remi Exp $
# Must be before x-modular eclass is inherited
SNAPSHOT="yes"
@@ -275,11 +275,11 @@ EPATCH_SUFFIX="patch"
GENTOO_PATCHES=(
"${FILESDIR}/1.4-fpic-libxf86config.patch"
"${FILESDIR}/1.4-fix-kdrive-automake.patch"
- "${FILESDIR}/1.5.2-force-LC_ALL-C-when-running-awk.patch"
)
# These have been sent upstream
UPSTREAMED_PATCHES=(
+ "${FILESDIR}/1.5.2-force-LC_ALL-C-when-running-awk.patch"
)
PATCHES=(