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

[Eric Bélanger]

    Date: Monday, April 27, 2009 @ 22:34:15
  Author: eric
Revision: 36822

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

........
  r36821 | eric | 2009-04-27 22:33:58 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-trident 1.3.1-3
      Added license, Added expat depends, Added xf86dgaproto and glproto makedepends
........

Added:
  xf86-video-trident/repos/extra-x86_64/LICENSE
    (from rev 36821, xf86-video-trident/trunk/LICENSE)
Modified:
  xf86-video-trident/repos/extra-x86_64/	(properties)
  xf86-video-trident/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   19 +++++++++++++++++++
 PKGBUILD |   15 ++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)


Property changes on: xf86-video-trident/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-trident/trunk:1-28579
   + /xf86-video-trident/trunk:1-36821

Copied: xf86-video-trident/repos/extra-x86_64/LICENSE (from rev 36821, xf86-video-trident/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-04-28 02:34:15 UTC (rev 36822)
@@ -0,0 +1,19 @@
+Copyright 1997-2003 by Alan Hourihane, North Wales, UK.
+
+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 Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Alan Hourihane makes no representations
+about the suitability of this software for any purpose.  It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE 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-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-28 02:33:58 UTC (rev 36821)
+++ extra-x86_64/PKGBUILD	2009-04-28 02:34:15 UTC (rev 36822)
@@ -3,22 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-trident
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Trident video driver"
 _mesaver="7.3"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libgl>=7.3')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'mesa>=7.3' 'xf86driproto' 'dri2proto>=1.99.3')
+license=('custom')
+depends=('libgl>=7.3' 'expat')
+makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'mesa>=7.3' 'xf86driproto' 'dri2proto>=1.99.3' 'xf86dgaproto' 'glproto')
 conflicts=('xorg-server<1.6.0')
 groups=('xorg-video-drivers')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
-	mesa-7.1-link-shared.patch)
-md5sums=('9f280bef235426394013cb5e1854b823'
-         '781e7811a6ed5c97b2b8defefc8ffbc9'
-         'f0baa948d9810f268413111ee439d24b')
+	mesa-7.1-link-shared.patch LICENSE)
+md5sums=('9f280bef235426394013cb5e1854b823' '781e7811a6ed5c97b2b8defefc8ffbc9'\
+         'f0baa948d9810f268413111ee439d24b' '92c153c192ee248572ec5fe8232a3d4d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -44,4 +44,5 @@
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/include"
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }