Commit 12eb57ac authored by Bernd Zeimetz's avatar Bernd Zeimetz

Update upstream source from tag 'upstream/1.7'

Update to upstream version '1.7'
with Debian dir 23b49712ade6e1ce53c7971e4ff99ed9a13c869d
parents 1339d389 52e02dc1
This diff is collapsed.
This diff is collapsed.
SUBDIRS = src test data po win32 help tools doc
SUBDIRS = src test data po windows help tools doc
INTLTOOL = \
intltool-extract.in \
......@@ -10,10 +10,13 @@ full:
make
EXTRA_DIST = \
README.md \
HACKING \
gnome-doc-utils.make \
ChangeLog.0 \
viking.spec \
mingw-viking.spec \
mingw64-viking.spec \
$(INTLTOOL)
.PHONY: generate-changelog
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -87,6 +87,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \
......@@ -104,7 +105,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = viking.spec
CONFIG_CLEAN_FILES = viking.spec mingw-viking.spec mingw64-viking.spec
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -140,7 +141,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -162,7 +163,8 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/viking.spec.in \
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/mingw-viking.spec.in \
$(srcdir)/mingw64-viking.spec.in $(srcdir)/viking.spec.in \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
compile config.guess config.rpath config.sub depcomp \
install-sh missing mkinstalldirs
......@@ -281,10 +283,14 @@ ISODATE = @ISODATE@
LDFLAGS = @LDFLAGS@
LIBCURL = @LIBCURL@
LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
LIBGEOCLUE_CFLAGS = @LIBGEOCLUE_CFLAGS@
LIBGEOCLUE_LIBS = @LIBGEOCLUE_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBZIP_CFLAGS = @LIBZIP_CFLAGS@
LIBZIP_LIBS = @LIBZIP_LIBS@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
......@@ -313,7 +319,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
POW_LIB = @POW_LIB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
......@@ -377,21 +382,28 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src test data po win32 help tools doc
SUBDIRS = src test data po windows help tools doc
INTLTOOL = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
EXTRA_DIST = \
README.md \
HACKING \
gnome-doc-utils.make \
ChangeLog.0 \
viking.spec \
mingw-viking.spec \
mingw64-viking.spec \
$(INTLTOOL)
MAINTAINERCLEANFILES = \
......@@ -429,8 +441,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -443,6 +455,10 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
viking.spec: $(top_builddir)/config.status $(srcdir)/viking.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mingw-viking.spec: $(top_builddir)/config.status $(srcdir)/mingw-viking.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mingw64-viking.spec: $(top_builddir)/config.status $(srcdir)/mingw64-viking.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
......@@ -550,7 +566,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......@@ -618,7 +637,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
......@@ -643,7 +662,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
......@@ -660,7 +679,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -670,7 +689,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
Viking 1.7 (2019-01-21)
New features since 1.6.2
* KMZ Map File Support
* Apply Button for Layer Properties
* Support More GPX Fields
* Updated Default Map: Mapbox Outdoors
* GeoClue Support for Automatic Location
* Faster GPX File Loading
* Waypoint / EXIF GPS Image Direction Support
* Support More Garmin Waypoint Symbols
* Support Garmin Device GPX Point Limits
* Windows GPSD Client
* Support 'External' GPX File Layers in .vik Files
* Usage of HTTPS addresses
* Support OAuth for OSM
* Support High Resolution Displays
* Track+Route Split+Join Tools
* Calculation of Eddington Number
* Calendar Display
* Can Select a Result from the Online Search Results
* Reproducible Builds
* 64bit Windows Build only
* Travis Build + CI
* Consistent Licensing of GPL2+
* Many Internal Improvements + Fixes
Fixes since 1.6.2
* SF Bugs#154: Ensure GPX output values are XSD:Decimal
* SF Bugs#151: Compatibility with GPSD API v7
* SF Bugs#152: Fix repeatedly showing the license dialog
* SF Bugs#148: Fix reversing manually created tracks & routes
* SF Bugs#146: Fix showing elevation gain/loss in track properties.
* SF Bugs#144: Fix Export to World File
* SF Bugs#138: Fix handling of <link> tags in GPX files.
* SF Bugs#135: Fix OSM Maps shown by default at Maximum Zoom.
* SF Bugs#133: Remove the auto added map when opening the first .vik file from the GUI.
* SF Bugs#134: Replaced discontinued MapQuest tile service with rate limited Mapbox Outdoors service.
* SF Bugs#132: Fix to correctly open GPX files in Windows via double click.
* SF Bugs#130: Fix GeoRef layer alpha value change to 255 is ignored until restart
* SF Bugs#22: Fix changing coordinates when saving and exporting
* SF Bugs#128: Fix Crash when loading broken .vik file
Viking 1.6.2 (2015-12-21)
Bug Fix Release
* Don't remove project name if one decides not to delete all layers.
......
Viking is a free/open source program to manage GPS data. You can
import, plot and create tracks, routes and waypoints, show OSM
and other maps, generate maps (using Mapnik),
see real-time GPS position, Geotag Images,
control items, upload/download OSM Traces and more.
It is written mainly in C with some C++ and uses the GTK+2 toolkit.
This file is just to please some automake setting
Website: http://viking.sf.net/
See README.md file for the actual information
Obtaining Viking
================
You can download tarball of latest released version at
http://sourceforge.net/projects/viking/files
You can also retrieve the latest development version on the official
Git repository:
$ git clone git://git.code.sf.net/p/viking/code viking
Installing Viking
=================
If you downloaded Viking from Git, you have to:
$ ./autogen.sh
Next, or if you downloaded a tarball, you have to:
$ ./configure
$ make
Check output of "./configure --help" for configuration options. In
particular, it is possible to disable some features, like
--disable-google in order to disable any Google stuff.
If you wish to install Viking, you have to (as root):
# make install
For detailed explanation on the install on Unix like systems,
see the INSTALL file.
Examples
========
See test/ subdirectory for examples.
Documentation
=============
See doc/ and help/ subdirectories for documentation.
You can also access user manual via Help menu entry.
# Viking [![Build Status](https://travis-ci.org/viking-gps/viking.svg?branch=master)](https://travis-ci.org/viking-gps/viking)
Viking is a free/open source program to manage GPS data. You can
import, plot and create tracks, routes and waypoints, show OSM
and other maps, generate maps (using Mapnik),
see real-time GPS position, Geotag Images,
control items, upload/download OSM Traces and more.
It is written mainly in C with some C++ and uses the GTK+2 toolkit.
Website: http://viking.sf.net/
## Obtaining Viking
You can download tarball of latest released version at
https://sourceforge.net/projects/viking/files
You can also retrieve the latest development version on the official
Git repository:
$ git clone git://git.code.sf.net/p/viking/code viking
## Installing Viking
### Dependencies
On Debian Sid, following packages must be installed before building:
# sudo apt install gtk-doc-tools gnome-doc-utils libpng-dev libgtk-3-dev libicu-dev
The following packages are needed (they are included by default in Debian Sid, but not in other distributions). They must be installed too:
$ sudo apt-get install libcurl4-gnutls-dev libgtk2.0-dev
The following packages are also used, but they can each be disabled with configure options, if desired:
$ sudo apt-get install libsqlite3-dev nettle-dev libmapnik-dev libgeoclue-2-dev libgexiv2-dev libgps-dev libmagic-dev libbz2-dev libzip-dev liboauth-dev
Further packages are required if you want to generate man and help page documentation:
$ sudo apt-get install docbook-xsl rarian-compat
### Actual Build
If you downloaded Viking from Git, you have to:
$ ./autogen.sh
Next, or if you downloaded a tarball, you have to:
$ ./configure
$ make
Check output of "./configure --help" for configuration options. In
particular, it is possible to disable some features, like
--disable-google in order to disable any Google stuff.
If you wish to install Viking, you have to (as root):
# make install
For detailed explanation on the install on Unix like systems,
see the INSTALL file.
### Examples
See test/ subdirectory for examples.
## Documentation
See doc/ and help/ subdirectories for documentation.
You can also access user manual via Help menu entry.
This diff is collapsed.
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
pkgdata_DATA = maps.xml external_tools.xml goto_tools.xml datasources.xml latlontz.txt
pkgdata_DATA = \
maps.xml \
external_tools.xml \
goto_tools.xml \
datasources.xml \
routing.xml \
latlontz.txt
EXTRA_DIST = \
$(pkgdata_DATA)
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -88,6 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = data
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/expat.m4 \
......@@ -227,10 +228,14 @@ ISODATE = @ISODATE@
LDFLAGS = @LDFLAGS@
LIBCURL = @LIBCURL@
LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
LIBGEOCLUE_CFLAGS = @LIBGEOCLUE_CFLAGS@
LIBGEOCLUE_LIBS = @LIBGEOCLUE_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBZIP_CFLAGS = @LIBZIP_CFLAGS@
LIBZIP_LIBS = @LIBZIP_LIBS@