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

[Eric Bélanger]

    Date: Tuesday, April 28, 2009 @ 00:09:12
  Author: eric
Revision: 36848

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

........
  r36807 | eric | 2009-04-27 21:46:59 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-s3 0.6.1-3
      Added license
........

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

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


Property changes on: xf86-video-s3/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-s3/trunk:1-28926
   + /xf86-video-s3/trunk:1-36847

Copied: xf86-video-s3/repos/extra-i686/LICENSE (from rev 36807, xf86-video-s3/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 04:09:12 UTC (rev 36848)
@@ -0,0 +1,25 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+     Copyright 2001  Ani Joshi <ajoshi at unixbox.com>
+
+     XFree86 4.x driver for S3 chipsets
+
+
+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 Ani Joshi not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  Ani Joshi makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as-is" without express or implied warranty.
+
+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ANI JOSHI 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.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 04:07:13 UTC (rev 36847)
+++ extra-i686/PKGBUILD	2009-04-28 04:09:12 UTC (rev 36848)
@@ -3,21 +3,23 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-s3
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 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=('a5f1f2f93a50e56bd3aeed009c407337')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('a5f1f2f93a50e56bd3aeed009c407337' '6b2bea29522da7cbb81cadde3235024d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./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"
 }