[arch-commits] Commit in gpsd/trunk (99-gpsd-usb.rules LICENSE PKGBUILD gpsd.confd)
Andrea Scarpino
andrea at archlinux.org
Fri Nov 5 00:01:27 UTC 2010
Date: Thursday, November 4, 2010 @ 20:01:27
Author: andrea
Revision: 98221
upgpkg: gpsd 2.95-5
fix python2 path and license; svn cleanup
Added:
gpsd/trunk/LICENSE
Modified:
gpsd/trunk/PKGBUILD
Deleted:
gpsd/trunk/99-gpsd-usb.rules
gpsd/trunk/gpsd.confd
-------------------+
99-gpsd-usb.rules | 19 -------------------
LICENSE | 38 ++++++++++++++++++++++++++++++++++++++
PKGBUILD | 18 ++++++++++++------
gpsd.confd | 22 ----------------------
4 files changed, 50 insertions(+), 47 deletions(-)
Deleted: 99-gpsd-usb.rules
===================================================================
--- 99-gpsd-usb.rules 2010-11-04 21:31:42 UTC (rev 98220)
+++ 99-gpsd-usb.rules 2010-11-05 00:01:27 UTC (rev 98221)
@@ -1,19 +0,0 @@
-# udev rules for the gpsd USB hotplugging
-
-SUBSYSTEM!="tty", GOTO="gpsd-usb_rules_end"
-
-#ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-#ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-ATTRS{idVendor}=="1163", ATTRS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-ATTRS{idVendor}=="1163", ATTRS{idProduct}=="0100", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-ATTRS{idVendor}=="067b", ATTRS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-ATTRS{idVendor}=="067b", ATTRS{idProduct}=="aaa0", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-ATTRS{idVendor}=="091e", ATTRS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-ATTRS{idVendor}=="091e", ATTRS{idProduct}=="0003", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-#ATTRS{idVendor}=="", ATTRS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="add", KERNEL=="ttyUSB[0-9]*", SYMLINK="gps%n", RUN+="/etc/hotplug/usb/gpsd add $root/%k"
-#ATTRS{idVendor}=="", ATTRS{idProduct}=="", SUBSYSTEM=="tty", ACTION=="remove", KERNEL=="ttyUSB[0-9]*", RUN+="/etc/hotplug/usb/gpsd remove $root/%k"
-
-LABEL="gpsd-usb_rules_end"
-
Added: LICENSE
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2010-11-05 00:01:27 UTC (rev 98221)
@@ -0,0 +1,38 @@
+ COPYRIGHTS
+
+Compilation copyright is held by the GPSD project. All rights reserved.
+
+GPSD project copyrights are assigned to the project lead, currently
+Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
+1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
+Copyright (c) 2005 by Eric S. Raymond. For other copyrights, see
+individual files.
+
+ BSD LICENSE
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:<P>
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.<P>
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.<P>
+
+Neither name of the GPSD project nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-04 21:31:42 UTC (rev 98220)
+++ PKGBUILD 2010-11-05 00:01:27 UTC (rev 98221)
@@ -6,11 +6,11 @@
pkgname=gpsd
pkgver=2.95
-pkgrel=4
+pkgrel=5
pkgdesc="GPS daemon and library to support USB/serial GPS devices"
arch=('i686' 'x86_64')
url="http://gpsd.berlios.de"
-license=('GPL')
+license=('BSD')
depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb1' 'qt')
optdepends=('php: generate a PHP status page for your GPS'
'php-gd: image support for the PHP status page')
@@ -19,15 +19,22 @@
options=('!libtool')
install="${pkgname}.install"
source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'gpsd')
+ 'gpsd' 'LICENSE')
md5sums=('12535a9ed9fecf9ea2c5bdc9840da5ae'
- 'f929322fc4670543fcb36dafc7bb9e03')
+ 'f929322fc4670543fcb36dafc7bb9e03'
+ 'd217a23f408e91c94359447735bc1800')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# install python to the same DESTDIR given make
sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in
+
+ # fix python 2.7 path
+ sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
+ sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
+ gpsfake gpsprof xgps xgpsspeed gps/gps.py
PYTHON=/usr/bin/python2 ./configure --prefix=/usr
make
@@ -56,6 +63,5 @@
install -D -m755 "${srcdir}/gpsd" "$pkgdir/etc/rc.d/gpsd"
- # fix python 2.7 path
- find "$pkgdir" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+ install -D -m644 "${srcdir}/LICENSE" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
Deleted: gpsd.confd
===================================================================
--- gpsd.confd 2010-11-04 21:31:42 UTC (rev 98220)
+++ gpsd.confd 2010-11-05 00:01:27 UTC (rev 98221)
@@ -1,22 +0,0 @@
-# Config file for gpsd server
-
-# ATTENTION: most of the configuration is done in the kernel device
-# setup for USB/Serial, Garmin, or other.
-
-# Set GPS_DEV to the device to be used by the gpsd server.
-# This device must have the group tty and be writable (see
-# the udev rule in the docs).
-
-# This example is for a Deluo GPS Serial/USB converter dongle, really
-# a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels.
-# The udev rule provides the symlink below to /dev/tts/USB0
-# The second one is just a normal serial port...
-
-#export GPS_DEV="/dev/ttyUSB0"
-
-#export GPS_DEV="/dev/ttyS0
-
-# Use the following for gpsd with ntp instead of the older one below
-#export GPSD_OPTS="-n ${GPS_DEV}"
-
-export GPSD_OPTS="-P /var/run/gpsd.pid -F /var/run/gpsd/gpsd.sock"
More information about the arch-commits
mailing list