[arch-commits] Commit in xorg-server/repos (testing-i686 testing-i686/PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Oct 21 21:19:24 UTC 2009
Date: Wednesday, October 21, 2009 @ 17:19:24
Author: andyrtr
Revision: 56444
Merged revisions 55872,56441 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk
........
r55872 | andyrtr | 2009-10-15 05:45:13 +0000 (Do, 15 Okt 2009) | 1 line
fix pkg conflicting with intel legacy driver
........
r56441 | andyrtr | 2009-10-21 21:15:33 +0000 (Mi, 21 Okt 2009) | 2 lines
upgpkg: xorg-server 1.7.0.902-1
new version 1.7.0.902 = 1.7.1rc2
........
Modified:
xorg-server/repos/testing-i686/ (properties)
xorg-server/repos/testing-i686/PKGBUILD
----------+
PKGBUILD | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Property changes on: xorg-server/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xorg-server/trunk:1-55685
+ /xorg-server/trunk:1-56443
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-10-21 21:16:48 UTC (rev 56443)
+++ testing-i686/PKGBUILD 2009-10-21 21:19:24 UTC (rev 56444)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.7.0.901
+pkgver=1.7.0.902
pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb'
- 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-vga')
+ 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy')
options=('!libtool')
provides=('x-server')
groups=('xorg')
@@ -21,7 +21,7 @@
xorg-redhat-die-ugly-pattern-die-die-die.patch
xvfb-run
xvfb-run.1)
-md5sums=('38c5cfbb5bda671aed9f390e9b7c34b4'
+md5sums=('a86effb82c27dd705771c37dcb6199e3'
'1a336eb22e27cbf443ec5a2ecddfa93c'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b')
More information about the arch-commits
mailing list