From: Rob Norris Date: Sat, 4 Feb 2012 10:51:18 +0000 (+0000) Subject: cleanup: Remove unused and out of date 'viking-remote' script and related files. X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/d82feff1f50b14729834dc12441b1cabce59b1fd cleanup: Remove unused and out of date 'viking-remote' script and related files. --- diff --git a/Makefile.am b/Makefile.am index d08f6027..ef31dde6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,12 +9,9 @@ full: ./autogen.sh make -bin_SCRIPTS = viking-remote - EXTRA_DIST = \ gnome-doc-utils.make \ ChangeLog.0 \ - viking-remote \ viking.spec \ $(INTLTOOL) diff --git a/VIKING-REMOTE.gconf b/VIKING-REMOTE.gconf deleted file mode 100644 index 6a886bde..00000000 --- a/VIKING-REMOTE.gconf +++ /dev/null @@ -1,2 +0,0 @@ -gconftool-2 -s -t bool /desktop/gnome/url-handlers/geo/enabled "true" -gconftool-2 -s -t string /desktop/gnome/url-handlers/geo/command "viking-remote \"%s\"" diff --git a/doc/Makefile.am b/doc/Makefile.am index efd2fc01..65d017ec 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = examples EXTRA_DIST = GETTING-STARTED GPSMAPPER \ - viking.xml viking-remote.xml + viking.xml CLEANFILES= @@ -9,7 +9,7 @@ CLEANFILES= # TODO conditional processing # (availability of docbook stylesheet and xsltproc) if GEN_MANPAGES -MANPAGES=viking.1 viking-remote.1 +MANPAGES=viking.1 man_MANS = $(MANPAGES) CLEANFILES+=$(MANPAGES) endif diff --git a/doc/viking-remote.xml b/doc/viking-remote.xml deleted file mode 100644 index 22ecfa1e..00000000 --- a/doc/viking-remote.xml +++ /dev/null @@ -1,124 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A -typical entry in a Makefile or Makefile.am is: - -DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ -manpages/docbook.xsl -XP=xsltproc -''-nonet - -manpage.1: manpage.dbk - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The -XSL files are in docbook-xsl. Please remember that if you -create the nroff version in one of the debian/rules file -targets (such as build), you will need to include xsltproc -and docbook-xsl in your Build-Depends control field. - ---> - - - Ralf"> - Meyer"> - - 2007-05-24"> - - 1"> - ranfyy@gmail.com"> - - VIKING"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - 2007 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to manage GPS data - - - - &dhpackage; - - - - DESCRIPTION - - - Viking is a free/open source program to manage GPS data. You can - import and plot tracks and waypoints, show OpenStreetMap (OSM) maps and/or - Terraserver maps under it, add coordinate lines, make new tracks - and waypoints, hide different things, etc. It is written in C - with the GTK+ 2 toolkit, available for Linux, other POSIX - operating systems, and Windows, and is licensed under the GNU GPL. - - - Homepage: - http://viking.sf.net - - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - - - &dhpackage; is a program to manage GPS data - - - - OPTIONS - - Usage: viking-remote uri - - - - - SEE ALSO - - viking (1). - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff --git a/doc/viking.xml b/doc/viking.xml index 51389284..94051b83 100644 --- a/doc/viking.xml +++ b/doc/viking.xml @@ -349,11 +349,6 @@ and docbook-xsl in your Build-Depends control field. - - SEE ALSO - - viking-remote (1). - AUTHOR diff --git a/viking-remote b/viking-remote deleted file mode 100755 index 568357ff..00000000 --- a/viking-remote +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/perl - -# -# geo://wpname:cmnt@34.15,-118.15/topo=/somedir,aerial=/someotherdir -# - -die "Usage: viking-remote uri\n" if ( $#ARGV < 0 ); - -if ( $ARGV[0] eq "debug" ) { - $DEBUG = 1; - shift @ARGV; -} else { - $DEBUG = 0; -} - -($ARGV[0] =~ m<(geo:)?/*([^/]*)(/(.*))?>) or die "Bad URI"; -$loc = $2; -$extras = $4; - -if ( $loc =~ /^(GC[0-9A-Z]+)$/ ) { - $gc = $loc; - $loc=`gcfetchtxt http://www.geocaching.com/seek/cache_details.aspx?wp=$loc|head -2|tail +2`; -} - -# have a lot of fun... -($loc =~ /^(([^:@]*)(:([^:@]*))?@)?N?(S?)\s*((([0-9'"`°o\-\.])|(° ))*)[, ]\s*E?(W?)\s*(([0-9'"`o\-\.]|(° ))*)(:([0-9\-\.]*))?$/) - or die "Bad URI"; - -$wp = $2 ? $2 : ( $gc ? $gc : "waypoint" ); -$cmt = $4; $lat = $6; $lon = $11; $alt = $15; - -$latfact = ($5 eq "S") ? -1 : 1; -$lonfact = ($10 eq "W") ? -1 : 1; - -if ( $lat =~ /^(-?)(\d*)[°'"`o] *([\d.]*)$/ ) { - $lat = ($2 + ($3/60)) * ($1 ? -1 : 1); -} -if ( $lon =~ /^(-?)(\d*)[°'"`o] *([\d.]*)$/ ) { - $lon = ($2 + ($3/60)) * ($1 ? -1 : 1); - } - -$lat *= $latfact; -$lon *= $lonfact; - -if ( $extras =~ /^(auto)?street/ ) { - $mode = "latlon"; - $zoom = 4.205; -} else { - $mode = "utm"; - $zoom = 4.0; -} - -if ( $DEBUG ) { - open(PIPE, "|cat"); -} else { - open(PIPE, "|viking -- -"); -} - -print PIPE < 0 ) { - $mapname = $mapanddir[0]; - $mapdir = $mapanddir[1]; - } - print PIPE <