[arch-commits] Commit in xorg-server/repos (testing-i686 testing-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, October 12, 2009 @ 16:55:03
  Author: andyrtr
Revision: 55452

Merged revisions 55450 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk

........
  r55450 | andyrtr | 2009-10-12 20:51:40 +0000 (Mo, 12 Okt 2009) | 2 lines
  
  upgpkg: xorg-server 1.7.0.901-1
      add conflicts for broken input drivers and a missing proto dep
........

Modified:
  xorg-server/repos/testing-i686/	(properties)
  xorg-server/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


Property changes on: xorg-server/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-55325
   + /xorg-server/trunk:1-55451

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-10-12 20:52:28 UTC (rev 55451)
+++ testing-i686/PKGBUILD	2009-10-12 20:55:03 UTC (rev 55452)
@@ -8,9 +8,11 @@
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5')
+depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
 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')
+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')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')