[arch-commits] Commit in xf86-video-trident/trunk (LICENSE PKGBUILD)

Jan de Groot jgc at archlinux.org
Mon Jul 12 17:31:57 UTC 2010


    Date: Monday, July 12, 2010 @ 13:31:57
  Author: jgc
Revision: 85363

upgpkg: xf86-video-trident 1.3.4-1
Update to 1.3.4 - replace license with upstream file

Modified:
  xf86-video-trident/trunk/PKGBUILD
Deleted:
  xf86-video-trident/trunk/LICENSE

----------+
 LICENSE  |   19 -------------------
 PKGBUILD |   18 ++++++++----------
 2 files changed, 8 insertions(+), 29 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-07-12 17:29:52 UTC (rev 85362)
+++ LICENSE	2010-07-12 17:31:57 UTC (rev 85363)
@@ -1,19 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-12 17:29:52 UTC (rev 85362)
+++ PKGBUILD	2010-07-12 17:31:57 UTC (rev 85363)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-trident
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.3.4
+pkgrel=1
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,17 +13,15 @@
 conflicts=('xorg-server<1.8.0')
 groups=('xorg-video-drivers')
 options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        LICENSE)
-sha1sums=('ac795465d47d807969970ae1433336439afad9b8'
-          '677c0891fbb60f832dd8131069ae60ddf7302c15')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7c40f5c02bddf399862782b708941e79302318af')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }




More information about the arch-commits mailing list