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

[Eric Bélanger]

    Date: Tuesday, April 28, 2009 @ 01:47:04
  Author: eric
Revision: 36859

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

........
  r36829 | eric | 2009-04-27 22:40:47 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-vga 4.1.0-8
      Added license, Added xorg-util-macros makedepends
........

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

----------+
 LICENSE  |   26 ++++++++++++++++++++++++++
 PKGBUILD |   12 +++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)


Property changes on: xf86-video-vga/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-vga/trunk:1-28896
   + /xf86-video-vga/trunk:1-36858

Copied: xf86-video-vga/repos/extra-i686/LICENSE (from rev 36829, xf86-video-vga/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 05:47:04 UTC (rev 36859)
@@ -0,0 +1,26 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
+
+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 THE
+XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from the
+XFree86 Project.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 05:43:12 UTC (rev 36858)
+++ extra-i686/PKGBUILD	2009-04-28 05:47:04 UTC (rev 36859)
@@ -3,18 +3,19 @@
 
 pkgname=xf86-video-vga
 pkgver=4.1.0
-pkgrel=7
+pkgrel=8
 pkgdesc="X.org VGA 16 color video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'xorg-util-macros')
 conflicts=('xorg-server<1.6.0')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	git-1b4bf389.patch)
-md5sums=('b93e5fe9757db779a75cd3ce97b9613d'
-	 '188e94890f8826c26bc16ed59563a78a')
+	git-1b4bf389.patch LICENSE)
+md5sums=('b93e5fe9757db779a75cd3ce97b9613d' '188e94890f8826c26bc16ed59563a78a'\
+         'd7c1c0dfc2e183f162162ef619c61f24')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,4 +27,5 @@
   ./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"
 }