[arch-commits] Commit in xf86-video-vesa/repos (3 files)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 09:59:17
  Author: jgc
Revision: 22362

Merged revisions 22266 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-vesa/trunk

........
  r22266 | jgc | 2008-12-25 16:51:11 +0000 (Thu, 25 Dec 2008) | 1 line
  
  upgpkg: xf86-video-vesa 2.1.0-1
........

Modified:
  xf86-video-vesa/repos/extra-x86_64/	(properties)
  xf86-video-vesa/repos/extra-x86_64/PKGBUILD
Deleted:
  xf86-video-vesa/repos/extra-x86_64/COPYING

----------+
 COPYING  |   24 ------------------------
 PKGBUILD |   16 +++++++---------
 2 files changed, 7 insertions(+), 33 deletions(-)


Property changes on: xf86-video-vesa/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-vesa/trunk:1-11594
   + /xf86-video-vesa/trunk:1-22360
Deleted: svn:mergeinfo
   - 

Deleted: extra-x86_64/COPYING
===================================================================
--- extra-x86_64/COPYING	2008-12-26 14:59:14 UTC (rev 22361)
+++ extra-x86_64/COPYING	2008-12-26 14:59:17 UTC (rev 22362)
@@ -1,24 +0,0 @@
-Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Except as contained in this notice, the name of Conectiva Linux shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-Conectiva Linux.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-26 14:59:14 UTC (rev 22361)
+++ extra-x86_64/PKGBUILD	2008-12-26 14:59:17 UTC (rev 22362)
@@ -2,21 +2,19 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-vesa
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.4.99.906')
-conflicts=('xorg-server<1.4.99.906')
+makedepends=('pkgconfig' 'xorg-server>=1.5.3')
+conflicts=('xorg-server<1.5.3')
 groups=('xorg' 'xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	COPYING)
-md5sums=('433cf6f961eb4a2ab6fcb086def0b2b4'
-         'e5418e7a75e21268637984e70265e146')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('d813269613b4d63ff6dbfbfbd104cc84')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -24,5 +22,5 @@
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }