[arch-commits] Commit in xf86-input-elo2300/repos (3 files)

[Eric Bélanger]

    Date: Sunday, April 26, 2009 @ 20:42:02
  Author: eric
Revision: 36718

Merged revisions 36665 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-input-elo2300/trunk

........
  r36665 | eric | 2009-04-26 17:21:07 -0400 (Sun, 26 Apr 2009) | 2 lines
  
  upgpkg: xf86-input-elo2300 1.1.2-3
      Added license, Added xorg-util-macros makedepends
........

Added:
  xf86-input-elo2300/repos/extra-i686/LICENSE
    (from rev 36665, xf86-input-elo2300/trunk/LICENSE)
Modified:
  xf86-input-elo2300/repos/extra-i686/	(properties)
  xf86-input-elo2300/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   11 +++++++----
 2 files changed, 54 insertions(+), 4 deletions(-)


Property changes on: xf86-input-elo2300/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-input-elo2300/trunk:1-28826
   + /xf86-input-elo2300/trunk:1-36717

Copied: xf86-input-elo2300/repos/extra-i686/LICENSE (from rev 36665, xf86-input-elo2300/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-27 00:42:02 UTC (rev 36718)
@@ -0,0 +1,47 @@
+This driver was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (c) 1998  Metro Link Incorporated
+
+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, cpy, 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 X CONSORTIUM 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 Metro Link shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Metro Link.
+
+
+Copyright 1995 by Patrick Lecoanet, France. <lecoanet at cenaath.cena.dgac.fr>
+                                                                           
+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  Patrick  Lecoanet not  be  used  in
+advertising or publicity pertaining to distribution of the software without
+specific,  written      prior  permission.     Patrick Lecoanet   makes  no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.                   
+                                                                           
+PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT  SHALL PATRICK LECOANET 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-27 00:40:12 UTC (rev 36717)
+++ extra-i686/PKGBUILD	2009-04-27 00:42:02 UTC (rev 36718)
@@ -3,18 +3,20 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-input-elo2300
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ELOGraphics 2300 TouchScreen input 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')
 groups=('xorg-input-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	git-77d10116.patch)
-md5sums=('611d0a77a80286bc926dd3c414e59555' 'bcc7222d378fe582324261567159332a')
+	git-77d10116.patch LICENSE)
+md5sums=('611d0a77a80286bc926dd3c414e59555' 'bcc7222d378fe582324261567159332a'\
+         '7e89be5fc66cdf9dfd6603a4844a70f7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,4 +28,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"
 }