[arch-commits] Commit in xf86-video-ark/repos (3 files)
Eric Bélanger
eric at archlinux.org
Sat May 2 04:42:52 UTC 2009
Date: Saturday, May 2, 2009 @ 00:42:52
Author: eric
Revision: 37474
Merged revisions 37469 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-ark/trunk
........
r37469 | eric | 2009-05-02 00:24:37 -0400 (Sat, 02 May 2009) | 2 lines
upgpkg: xf86-video-ark 0.7.1-3
Added license
........
Added:
xf86-video-ark/repos/extra-i686/LICENSE
(from rev 37469, xf86-video-ark/trunk/LICENSE)
Modified:
xf86-video-ark/repos/extra-i686/ (properties)
xf86-video-ark/repos/extra-i686/PKGBUILD
----------+
LICENSE | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 8 +++++---
2 files changed, 53 insertions(+), 3 deletions(-)
Property changes on: xf86-video-ark/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xf86-video-ark/trunk:1-28870
+ /xf86-video-ark/trunk:1-37473
Copied: xf86-video-ark/repos/extra-i686/LICENSE (from rev 37469, xf86-video-ark/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2009-05-02 04:42:52 UTC (rev 37474)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000 Ani Joshi <ajoshi at unixbox.com>
+ *
+ * XFree86 4.x driver for ARK Logic chipset
+ *
+ * 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.
+ *
+ *
+ * Based on the 3.3.x driver by:
+ * Harm Hanemaayer <H.Hanemaayer at inter.nl.net>
+ *
+ */
+
+# Copyright 2005 Adam Jackson.
+#
+# 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
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, 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 (including the next
+# paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON 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-05-02 04:39:31 UTC (rev 37473)
+++ extra-i686/PKGBUILD 2009-05-02 04:42:52 UTC (rev 37474)
@@ -3,21 +3,23 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-ark
pkgver=0.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="X.org ark 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=('be91391f061863617018403cdbd2944f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('be91391f061863617018403cdbd2944f' 'cd9575e3812a060f316b98ca7e91bc7a')
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"
}
More information about the arch-commits
mailing list