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

[Eric Bélanger]

    Date: Tuesday, April 28, 2009 @ 00:10:45
  Author: eric
Revision: 36849

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

........
  r36809 | eric | 2009-04-27 21:49:29 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-s3virge 1.10.2-3
      Added license
........

Added:
  xf86-video-s3virge/repos/extra-i686/LICENSE
    (from rev 36809, xf86-video-s3virge/trunk/LICENSE)
Modified:
  xf86-video-s3virge/repos/extra-i686/	(properties)
  xf86-video-s3virge/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   25 +++++++++++++++++++++++++
 PKGBUILD |    8 +++++---
 2 files changed, 30 insertions(+), 3 deletions(-)


Property changes on: xf86-video-s3virge/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-s3virge/trunk:1-28928
   + /xf86-video-s3virge/trunk:1-36848

Copied: xf86-video-s3virge/repos/extra-i686/LICENSE (from rev 36809, xf86-video-s3virge/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 04:10:45 UTC (rev 36849)
@@ -0,0 +1,25 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
+
+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, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT 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 the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 04:09:12 UTC (rev 36848)
+++ extra-i686/PKGBUILD	2009-04-28 04:10:45 UTC (rev 36849)
@@ -3,17 +3,18 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-s3virge
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('glibc')
 makedepends=('pkgconfig' 'xorg-server>=1.6.0')
 conflicts=('xorg-server<1.6.0')
 options=(!libtool)
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('69784e4964d75487d81be4eae3d467dd')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('69784e4964d75487d81be4eae3d467dd' 'c0a38dfcd6288eff39322f7c584b8d1e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,4 +22,5 @@
               --disable-dri || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }