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

Eric Bélanger eric at archlinux.org
Tue Apr 28 01:50:24 EDT 2009


    Date: Tuesday, April 28, 2009 @ 01:50:24
  Author: eric
Revision: 36860

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

........
  r36831 | eric | 2009-04-27 22:44:18 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-vmware 10.16.5-3
      Added license
........

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

----------+
 LICENSE  |   27 +++++++++++++++++++++++++++
 PKGBUILD |    9 ++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)


Property changes on: xf86-video-vmware/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-vmware/trunk:1-28891
   + /xf86-video-vmware/trunk:1-36859

Copied: xf86-video-vmware/repos/extra-i686/LICENSE (from rev 36831, xf86-video-vmware/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 05:50:24 UTC (rev 36860)
@@ -0,0 +1,27 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+Copyright (C) 1998-2002 VMware, Inc.
+
+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 fur-
+nished 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 CON-
+NECTION 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 deal-
+ings in this Software without prior written authorization from the XFree86
+Project.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 05:47:04 UTC (rev 36859)
+++ extra-i686/PKGBUILD	2009-04-28 05:50:24 UTC (rev 36860)
@@ -3,18 +3,20 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-vmware
 pkgver=10.16.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('glibc')
 makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'randrproto' 'renderproto' 'xextproto' 'xineramaproto' 'videoproto')
 conflicts=('xorg-server<1.6.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	manpage.patch)
-md5sums=('6d78c82ea7c2bb0fcb587d7bb4e8f60a' '44de7fe73cf6261d489246bd4f8f0a6c')
+	manpage.patch LICENSE)
+md5sums=('6d78c82ea7c2bb0fcb587d7bb4e8f60a' '44de7fe73cf6261d489246bd4f8f0a6c'\
+         'f846374287a2bae21570ae8de883fb4d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +24,5 @@
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }



More information about the arch-commits mailing list