Date: Sunday, August 21, 2011 @ 19:13:31 Author: andrea Revision: 136033
db-move: moved gpsd from [testing] to [extra] (x86_64) Added: gpsd/repos/extra-x86_64/PKGBUILD (from rev 136031, gpsd/repos/testing-x86_64/PKGBUILD) gpsd/repos/extra-x86_64/gpsd (from rev 136031, gpsd/repos/testing-x86_64/gpsd) gpsd/repos/extra-x86_64/gpsd.conf.d (from rev 136031, gpsd/repos/testing-x86_64/gpsd.conf.d) gpsd/repos/extra-x86_64/gpsd.install (from rev 136031, gpsd/repos/testing-x86_64/gpsd.install) Deleted: gpsd/repos/extra-x86_64/LICENSE gpsd/repos/extra-x86_64/PKGBUILD gpsd/repos/extra-x86_64/gpsd gpsd/repos/extra-x86_64/gpsd.install gpsd/repos/testing-x86_64/ --------------+ LICENSE | 38 -------------- PKGBUILD | 152 ++++++++++++++++++++++++++++----------------------------- gpsd | 87 ++++++++++++++++---------------- gpsd.conf.d | 5 + gpsd.install | 32 ++++++------ 5 files changed, 140 insertions(+), 174 deletions(-) Deleted: extra-x86_64/LICENSE =================================================================== --- extra-x86_64/LICENSE 2011-08-21 23:13:30 UTC (rev 136032) +++ extra-x86_64/LICENSE 2011-08-21 23:13:31 UTC (rev 136033) @@ -1,38 +0,0 @@ - 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. Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-08-21 23:13:30 UTC (rev 136032) +++ extra-x86_64/PKGBUILD 2011-08-21 23:13:31 UTC (rev 136033) @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Giacomo Rizzo <a...@free-os.it> - -pkgname=gpsd -pkgver=2.96 -pkgrel=1 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('i686' 'x86_64') -url="http://gpsd.berlios.de" -license=('BSD') -depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils') -optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') -makedepends=('docbook-xsl') -backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool') -install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gpsd' 'LICENSE') -md5sums=('26a7a04d4298bc3a3a5d89fef4582b64' - '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 \ - --disable-libQgpsmm \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix man pages path (FS#21715) - sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - - make DESTDIR="${pkgdir}" install - - # Our own udev-install since the Makefile uses absolute paths - # Original file names are [mostly] unmodified: useful to match process name in case of error - # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/ - sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd - sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd - install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd" - - sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules - install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper - install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper" - - # Patch a path bug. Check to see if fixed in ensuing releases - sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" - - install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop - install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop - install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png - - install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: gpsd/repos/extra-x86_64/PKGBUILD (from rev 136031, gpsd/repos/testing-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-08-21 23:13:31 UTC (rev 136033) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: Giacomo Rizzo <a...@free-os.it> + +pkgname=gpsd +pkgver=3.0 +pkgrel=3 +pkgdesc="GPS daemon and library to support USB/serial GPS devices" +arch=('i686' 'x86_64') +url="http://gpsd.berlios.de" +license=('BSD') +depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') +optdepends=('php: generate a PHP status page for your GPS' + 'php-gd: image support for the PHP status page') +makedepends=('scons' 'docbook-xsl' 'chrpath') +backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') +options=('!libtool' '!buildflags') +install="${pkgname}.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gpsd' 'gpsd.conf.d') +md5sums=('c63d41a26868e9bdd48d9e311a9cc42c' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix python 2.7 path + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \ + gpsprof xgps xgpsspeed + + scons prefix=/usr \ + systemd=yes \ + libQgpsmm=no \ + PYTHONPATH=/usr/bin/python2 + scons build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix man pages path (FS#21715) + sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 + + export DESTDIR="${pkgdir}" + scons install + + install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" + + install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" + + sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug + install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" + + # GPSD needs RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 + chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} + chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} + + install -D -m644 packaging/X11/xgps.desktop \ + "${pkgdir}/usr/share/applications/xgps.desktop" + install -D -m644 packaging/X11/xgpsspeed.desktop \ + "${pkgdir}/usr/share/applications/xgpsspeed.desktop" + install -D -m644 packaging/X11/gpsd-logo.png \ + "${pkgdir}/usr/share/gpsd/gpsd-logo.png" + + install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: extra-x86_64/gpsd =================================================================== --- extra-x86_64/gpsd 2011-08-21 23:13:30 UTC (rev 136032) +++ extra-x86_64/gpsd 2011-08-21 23:13:31 UTC (rev 136033) @@ -1,43 +0,0 @@ -#! /bin/sh - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd - -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PID=$(pidof -o %PPID /usr/sbin/gpsd) - -case "$1" in - start) - stat_busy "Starting gpsd" - [ ! -d /var/run/gpsd ] && install -d /var/run/gpsd - [ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon gpsd - stat_done - fi - ;; - stop) - stat_busy "Stopping gpsd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/$PID.pid &>/dev/null - rm_daemon gpsd - stat_done - fi - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: gpsd/repos/extra-x86_64/gpsd (from rev 136031, gpsd/repos/testing-x86_64/gpsd) =================================================================== --- extra-x86_64/gpsd (rev 0) +++ extra-x86_64/gpsd 2011-08-21 23:13:31 UTC (rev 136033) @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd + +NAME=gpsd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME/$NAME.pid +PID=$(cat $PIDFILE 2>/dev/null) + +case "$1" in + start) + stat_busy "Starting $NAME" + [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME + [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $NAME + stat_done + fi + ;; + stop) + stat_busy "Stopping $NAME" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $PIDFILE &>/dev/null + rm_daemon $NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Copied: gpsd/repos/extra-x86_64/gpsd.conf.d (from rev 136031, gpsd/repos/testing-x86_64/gpsd.conf.d) =================================================================== --- extra-x86_64/gpsd.conf.d (rev 0) +++ extra-x86_64/gpsd.conf.d 2011-08-21 23:13:31 UTC (rev 136033) @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true" Deleted: extra-x86_64/gpsd.install =================================================================== --- extra-x86_64/gpsd.install 2011-08-21 23:13:30 UTC (rev 136032) +++ extra-x86_64/gpsd.install 2011-08-21 23:13:31 UTC (rev 136033) @@ -1,16 +0,0 @@ -post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} Copied: gpsd/repos/extra-x86_64/gpsd.install (from rev 136031, gpsd/repos/testing-x86_64/gpsd.install) =================================================================== --- extra-x86_64/gpsd.install (rev 0) +++ extra-x86_64/gpsd.install 2011-08-21 23:13:31 UTC (rev 136033) @@ -0,0 +1,16 @@ +post_install() { + echo ">>> Note: the supplied gpsd udev rules are device-specific, so" + echo ">>> if your device isn't detected correctly, please use lsusb or" + echo ">>> another suitable tool to determine the proper device IDs and" + echo ">>> use the commented rules to fill in the blanks for your device." + + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +}