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

[Eric Bélanger]

    Date: Sunday, April 26, 2009 @ 20:15:55
  Author: eric
Revision: 36713

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

........
  r36655 | eric | 2009-04-26 17:08:26 -0400 (Sun, 26 Apr 2009) | 2 lines
  
  upgpkg: xf86-input-calcomp 1.1.2-3
      Added license
........

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

----------+
 LICENSE  |   33 +++++++++++++++++++++++++++++++++
 PKGBUILD |    9 ++++++---
 2 files changed, 39 insertions(+), 3 deletions(-)


Property changes on: xf86-input-calcomp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-input-calcomp/trunk:1-28816
   + /xf86-input-calcomp/trunk:1-36712

Copied: xf86-input-calcomp/repos/extra-i686/LICENSE (from rev 36655, xf86-input-calcomp/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-27 00:15:55 UTC (rev 36713)
@@ -0,0 +1,33 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Copyright (c) 2000,2001  Martin Kroeker (mk at daveg.com)
+sample driver used :
+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, 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 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.
+
+Except as contained in this notice, the names of Martin Kroeker and/or
+Daveg GmbH shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization  from Martin Kroeker or Daveg GmbH.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-27 00:09:55 UTC (rev 36712)
+++ extra-i686/PKGBUILD	2009-04-27 00:15:55 UTC (rev 36713)
@@ -3,18 +3,20 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-input-calcomp
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org CalComp Drawing Board input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('glibc')
 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-931367e1.patch)
-md5sums=('ebc9a64dc72ae3015c16011bbd2d3557' '418bf8f0b75173a5e769c9af20972ba7')
+	git-931367e1.patch LICENSE)
+md5sums=('ebc9a64dc72ae3015c16011bbd2d3557' '418bf8f0b75173a5e769c9af20972ba7'\
+         'dc316976a34c309431481f51e409d1f6')
 
 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"
 }