[arch-commits] Commit in xf86-input-joystick/trunk (LICENSE PKGBUILD)

[Jan de Groot]

    Date: Wednesday, August 10, 2011 @ 08:03:42
  Author: jgc
Revision: 135123

upgpkg: xf86-input-joystick 1.6.0-2
rebuild for xserver 1.11

Modified:
  xf86-input-joystick/trunk/PKGBUILD
Deleted:
  xf86-input-joystick/trunk/LICENSE

----------+
 LICENSE  |   22 ----------------------
 PKGBUILD |   14 ++++++--------
 2 files changed, 6 insertions(+), 30 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2011-08-10 11:53:30 UTC (rev 135122)
+++ LICENSE	2011-08-10 12:03:42 UTC (rev 135123)
@@ -1,22 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright 1995-1999 by Frederic Lepied, France. <Lepied at XFree86.org>
-
-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  Frederic   Lepied not  be  used  in
-advertising or publicity pertaining to distribution of the software without
-specific,  written      prior  permission.     Frederic  Lepied   makes  no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
-INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
-EVENT  SHALL FREDERIC  LEPIED 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: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-10 11:53:30 UTC (rev 135122)
+++ PKGBUILD	2011-08-10 12:03:42 UTC (rev 135123)
@@ -3,22 +3,20 @@
 
 pkgname=xf86-input-joystick
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.10.0')
+makedepends=('xorg-server-devel>=1.10.99.902')
+conflicts=('xorg-server<1.10.99.902')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        50-joystick.conf
-        LICENSE)
+        50-joystick.conf)
 sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11'
-          'ee4c79491b36a680ed9d86f5fc41ae447f26353e')
+          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,5 +33,5 @@
   install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }