diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-07-31 11:40:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-07-31 11:40:18 +0000 |
| commit | 32bd9eb0c5cc813689b5b3709bb1f3380d82a640 (patch) | |
| tree | 1801da676bc8286f4d72a320fef6276d460d8f5f /x11-base | |
| parent | Version bump to be in sync with the rest; no code changes (diff) | |
| download | gentoo-2-32bd9eb0c5cc813689b5b3709bb1f3380d82a640.tar.gz gentoo-2-32bd9eb0c5cc813689b5b3709bb1f3380d82a640.tar.bz2 gentoo-2-32bd9eb0c5cc813689b5b3709bb1f3380d82a640.zip | |
Add patches from nominations branch. So we can open stablerequest for 1.7.7-r1.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.7.7.ebuild) | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 48682a16015c..1bbac1881c97 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.520 2010/07/22 19:54:18 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.521 2010/07/31 11:40:18 scarabeus Exp $ + +*xorg-server-1.7.7-r1 (31 Jul 2010) + + 31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.7.7.ebuild, +xorg-server-1.7.7-r1.ebuild: + Add patches from nominations branch. So we can open stablerequest for + 1.7.7-r1. 22 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xorg-server-1.8.0.ebuild, -xorg-server-1.8.1.901.ebuild, diff --git a/x11-base/xorg-server/xorg-server-1.7.7.ebuild b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild index afd89e0d73ed..479215384a0c 100644 --- a/x11-base/xorg-server/xorg-server-1.7.7.ebuild +++ b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.1 2010/07/31 11:40:18 scarabeus Exp $ EAPI="2" @@ -13,6 +13,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" OPENGL_DIR="xorg-x11" +SRC_URI="${SRC_URI} + http://dev.gentoo.org/~scarabeus/${P}-patches-01.tar.bz2 +" DESCRIPTION="X.Org X servers" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" @@ -120,7 +123,7 @@ EPATCH_SUFFIX="patch" # These have been sent upstream UPSTREAMED_PATCHES=( - #"${WORKDIR}/patches/" + "${WORKDIR}/patches/" # Fix for bug #304067 "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch" ) |