[arch-commits] Commit in xorg-server/repos (3 files)

[Jan de Groot]

    Date: Monday, November 10, 2008 @ 03:15:48
  Author: jgc
Revision: 18907

Merged revisions 18843 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-server/trunk

........
  r18843 | jgc | 2008-11-09 19:26:37 +0100 (Sun, 09 Nov 2008) | 3 lines
  
  upgpkg: xorg-server 1.5.3-2
      Add post_upgrade message for people upgrading from older versions without input hotplugging
  Add dependency on xf86-input-evdev, as default Xorg will not have keyboard support without it (yes, this creates a circular dependency)
........

Modified:
  xorg-server/repos/testing-x86_64/	(properties)
  xorg-server/repos/testing-x86_64/PKGBUILD
  xorg-server/repos/testing-x86_64/xorg-server.install

---------------------+
 PKGBUILD            |    4 ++--
 xorg-server.install |    8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)


Property changes on: xorg-server/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-server/trunk:1-18521
   + /xorg-server/trunk:1-18906

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-11-10 07:55:11 UTC (rev 18906)
+++ testing-x86_64/PKGBUILD	2008-11-10 08:15:48 UTC (rev 18907)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-server
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('libx11>=1.1.5' 'libxkbui>=1.0.2' 'libgl' 'libxfont>=1.3.3' 'openssl>=0.9.8h' 'libxxf86misc>=1.0.1' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'libxaw>=1.0.4' 'pixman>=0.11.10' 'hal>=0.5.11' 'xcursor-themes' 'xkeyboard-config>=1.3' 'xorg-server-utils' 'xorg-utils' 'xorg-fonts-misc' 'xbitmaps' 'libdrm>=2.3.1' 'diffutils')
+depends=('libx11>=1.1.5' 'libxkbui>=1.0.2' 'libgl' 'libxfont>=1.3.3' 'openssl>=0.9.8h' 'libxxf86misc>=1.0.1' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'libxaw>=1.0.4' 'pixman>=0.11.10' 'hal>=0.5.11' 'xcursor-themes' 'xkeyboard-config>=1.3' 'xorg-server-utils' 'xorg-utils' 'xorg-fonts-misc' 'xbitmaps' 'libdrm>=2.3.1' 'diffutils' 'xf86-input-evdev')
 makedepends=('glproto>=1.4.9' 'xf86driproto>=2.0.4' 'mesa>=7.2' 'randrproto>=1.2.2' 'renderproto>=0.9.3' 'scrnsaverproto>=1.1.0' 'fontsproto>=2.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'trapproto>=3.4.3' 'resourceproto>=1.0.2' 'xineramaproto>=1.1.2' 'evieext>=1.0.2' 'libxkbfile>=1.0.5' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'libxxf86dga>=1.0.2' 'inputproto>=1.4.4' 'xcmiscproto>=1.1.2' 'bigreqsproto' 'libdrm=2.3.1')
 options=('!libtool')
 provides=('x-server')

Modified: testing-x86_64/xorg-server.install
===================================================================
--- testing-x86_64/xorg-server.install	2008-11-10 07:55:11 UTC (rev 18906)
+++ testing-x86_64/xorg-server.install	2008-11-10 08:15:48 UTC (rev 18907)
@@ -12,6 +12,14 @@
 }
 
 post_upgrade() {
+  if [ "`vercmp $2 1.4.99.906`" -lt 0 ]; then
+    cat << _EOF
+
+  Input device handling has changed in xorg-server 1.5.
+  Please read http://wiki.archlinux.org/index.php/Xorg_input_hotplugging.
+
+_EOF
+  fi
   post_install
 }