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

[Eric Bélanger]

    Date: Sunday, April 26, 2009 @ 17:10:26
  Author: eric
Revision: 36658

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

........
  r36657 | eric | 2009-04-26 17:10:09 -0400 (Sun, 26 Apr 2009) | 2 lines
  
  upgpkg: xf86-input-citron 2.2.1-3
      Added license, Added xorg-util-macros makedepends
........

Added:
  xf86-input-citron/repos/extra-x86_64/LICENSE
    (from rev 36657, xf86-input-citron/trunk/LICENSE)
Modified:
  xf86-input-citron/repos/extra-x86_64/	(properties)
  xf86-input-citron/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   12 +++++++-----
 2 files changed, 57 insertions(+), 5 deletions(-)


Property changes on: xf86-input-citron/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-input-citron/trunk:1-28489
   + /xf86-input-citron/trunk:1-36657

Copied: xf86-input-citron/repos/extra-x86_64/LICENSE (from rev 36657, xf86-input-citron/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-04-26 21:10:26 UTC (rev 36658)
@@ -0,0 +1,50 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Upstream copyright notices / licenses:
+
+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 1999-2001 by Thomas Thanner, Citron GmbH, Germany. <support at citron.de>
+Copyright 1999-2003 by Peter Kunzmann, Citron GmbH, Germany. <kunzmann at citron.de>
+
+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 Thomas Thanner and Citron GmbH not be used in advertising or
+publicity pertaining to distribution of the software without specific, written
+prior permission. Thomas Thanner and Citron GmbH makes no representations about
+the suitability of this software for any purpose. It is provided "as is"
+without express or implied warranty.
+
+THOMAS THANNER AND CITRON GMBH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL THOMAS THANNER OR CITRON GMBH BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RSULTING 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-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-26 21:10:09 UTC (rev 36657)
+++ extra-x86_64/PKGBUILD	2009-04-26 21:10:26 UTC (rev 36658)
@@ -4,19 +4,20 @@
 
 pkgname=xf86-input-citron
 pkgver=2.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org  Citron Infrared Touch 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')
 groups=('xorg-input-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	git-32bdc726.patch)
-md5sums=('4e254fcefb3bea55772e63c12570f6d9'
-         'ccc0a372b61aac148967060cb23ec37c')
+	git-32bdc726.patch LICENSE)
+md5sums=('4e254fcefb3bea55772e63c12570f6d9' 'ccc0a372b61aac148967060cb23ec37c'\
+         'e3bee34f28fb1c60283142dc89c53728')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,4 +29,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"
 }