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

Tue Apr 28 03:16:30 UTC 2009

Date: Monday, April 27, 2009 @ 23:16:30
  Author: eric
Revision: 36836

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

........
  r36783 | eric | 2009-04-27 20:58:59 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-chips 1.2.1-3
      Added license
........

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

----------+
 LICENSE  |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |    9 ++++--
 2 files changed, 95 insertions(+), 3 deletions(-)


Property changes on: xf86-video-chips/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-chips/trunk:1-28874
   + /xf86-video-chips/trunk:1-36835

Copied: xf86-video-chips/repos/extra-i686/LICENSE (from rev 36783, xf86-video-chips/trunk/LICENSE)
===================================================================

--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 03:16:30 UTC (rev 36836)
@@ -0,0 +1,89 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright 1993 by Jon Block <block at frc.com>
+Modified by Mike Hollick <hollick at graphics.cis.upenn.edu>
+Modified 1994 by Régis Cridlig <cridlig at dmi.ens.fr>
+
+Major Contributors to XFree86 3.2
+Modified 1995/6 by Nozomi Ytow
+Modified 1996 by Egbert Eich <eich at xfree86.org>
+Modified 1996 by David Bateman <dbateman at club-internet.fr>
+Modified 1996 by Xavier Ducoin <xavier at rd.lectra.fr>
+
+Contributors to XFree86 3.2
+Modified 1995/6 by Ken Raeburn <raeburn at raeburn.org>
+Modified 1996 by Shigehiro Nomura <nomura at sm.sony.co.jp>
+Modified 1996 by Marc de Courville <marc at courville.org>
+Modified 1996 by Adam Sulmicki <adam at cfar.umd.edu>
+Modified 1996 by Jens Maurer <jmaurer at cck.uni-kl.de>
+
+Large parts rewritten for XFree86 4.0
+Modified 1998 by David Bateman <dbateman at club-internet.fr>
+Modified 1998 by Egbert Eich <eich at xfree86.org>
+Modified 1998 by Nozomi Ytow
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the authors not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The authors makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 1997
+Digital Equipment Corporation. All rights reserved.
+This software is furnished under license and may be used and copied only in
+accordance with the following terms and conditions.  Subject to these
+conditions, you may download, copy, install, use, modify and distribute
+this software in source and/or binary form. No title or ownership is
+transferred hereby.
+1) Any source code used, modified or distributed must reproduce and retain
+this copyright notice and list of conditions as they appear in the
+source file.
+
+2) No right is granted to use any trade name, trademark, or logo of Digital
+Equipment Corporation. Neither the "Digital Equipment Corporation" name
+nor any trademark or logo of Digital Equipment Corporation may be used
+to endorse or promote products derived from this software without the
+prior written permission of Digital Equipment Corporation.
+
+3) This software is provided "AS-IS" and any express or implied warranties,
+including but not limited to, any implied warranties of merchantability,
+fitness for a particular purpose, or non-infringement are disclaimed. In
+no event shall DIGITAL be liable for any damages whatsoever, and in
+particular, DIGITAL shall not be liable for special, indirect,
+consequential, or incidental damages or damages for lost profits, loss
+of revenue or loss of use, whether such damages arise in contract,
+negligence, tort, under statute, in equity, at law or otherwise, even if
+advised of the possibility of such damage.
+
+Copyright 1994  The XFree86 Project
+
+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
+DAVID WEXELBLAT 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.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 03:14:14 UTC (rev 36835)
+++ extra-i686/PKGBUILD	2009-04-28 03:16:30 UTC (rev 36836)
@@ -3,21 +3,24 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-chips
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Chips and Technologies 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')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2f2643fca6335f18024bffa6c4e0c12f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('2f2643fca6335f18024bffa6c4e0c12f' 'f9026850995ba8ce7eefec893d798f5d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
 }


