From b9cce2a044045c64fe077f8aeb738ef9270d61c4 Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Sat, 20 Mar 2021 20:17:13 +0000
Subject: [PATCH] Releasing Viking 1.9

---
 NEWS                                   | 32 ++++++++++++++++++++++++++
 configure.ac                           |  2 +-
 help/C/index.docbook                   |  6 ++---
 org.viking.Viking.appdata.xml          |  2 ++
 org.viking.Viking.yml                  |  4 ++--
 windows/installer/viking-installer.nsi |  2 +-
 6 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 571d2d041..ffd509e17 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,35 @@
+Viking 1.8 (2021-03-20)
+New features since 1.8
+* GPX 1.1 Support for most common Extensions (inc. Heart Rate, Power, Temperature & Cadence)
+* GTK3
+** Pinch Zoom support on Touchpads/Touchscreens (not GTK2 build)
+* Select Tool is now the default with more intuitive behaviour to enable moving the map
+* [OpenTopoMap](https://opentopomap.org) is the new Map Default
+* Online Search in Left Hand Pane
+* Track Statistics in Left Hand Pane
+* [OSRM](http://project-osrm.org) Routing Support
+* Log diagnostic Window
+* DEM Colour options
+* DEM Server enhanced support (NASA Earthdata login and alternative DEM server configuration)
+* Ruler uses Great Circle drawing and distance.
+* Single key Shortcuts support
+* Improved Track Area Coverage (faster drawing, option to limit years of coverage)
+* Monthly Statistics Analysis
+* Native KML Parser enabling support for more KML features
+* More KML export options
+* Ability to convert Tracks/Routes to Waypoints and vice versa.
+* Ability to 'Rotate' Routes/Tracks, i.e. to shift the start/end point of circular routes.
+* Ability to Reset Preferences and Layer Defaults
+* Ability to Reset Layers back to the Layer Default.
+* Enable Filtering on some List Displays (hence a basic internal search).
+* Support more GPX 1.0 Waypoint fields - the less commonally encountered ones.
+* Flatpak Version - also available on [Flathub](https://flathub.org/apps/details/org.viking.Viking)
+
+Fixes since 1.8
+* SF Bugs#157: Waypoint Properties dialog shows wrong waypoint symbol
+* SF Bugs#149: HTTPS Does not work on Windows install
+* SF Bugs#84: Losses Extended Waypoint Information on Save/Export
+
 Viking 1.8 (2020-02-02)
 New features since 1.7
 * New GeoClue Layer to Track Position from the GeoClue service
diff --git a/configure.ac b/configure.ac
index d6ae375ad..d1c881bf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.64)
-AC_INIT(viking, 1.8, , viking, http://viking.sf.net/)
+AC_INIT(viking, 1.9, , viking, http://viking.sf.net/)
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
diff --git a/help/C/index.docbook b/help/C/index.docbook
index 0ebe045aa..c62204467 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -3,9 +3,9 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY appname          "Viking">
   <!ENTITY app "<application>Viking</application>">
-  <!ENTITY appversion   "1.8">
-  <!ENTITY manrevision  "1.8">
-  <!ENTITY date "February 2020">
+  <!ENTITY appversion   "1.9">
+  <!ENTITY manrevision  "1.9">
+  <!ENTITY date "March 2021">
   <!ENTITY extfiles    "<filename>maps.xml</filename>, <filename>goto_tools.xml</filename>, <filename>datasources.xml</filename>, <filename>external_tools.xml</filename>, <filename>routing.xml</filename>">
 ]>
 <!-- =============Document Header ============================= -->
diff --git a/org.viking.Viking.appdata.xml b/org.viking.Viking.appdata.xml
index 97e155b25..bc64ec641 100644
--- a/org.viking.Viking.appdata.xml
+++ b/org.viking.Viking.appdata.xml
@@ -28,6 +28,7 @@
       <li>Follow Realtime GPS Position</li>
       <li>Visualization and Statistics</li>
       <li>Digitial Elevation Model (DEM) Support</li>
+      <li>OSRM Routing Support</li>
       <!-- Currently not in Flatpak Version -->
       <!-- <li>Generate Maps (using Mapnik)</li> -->
     </ul>
@@ -43,6 +44,7 @@
   <update_contact>rw_norris_AT_hotmail.com</update_contact>
   <translation type="gettext">viking</translation>
   <releases>
+    <release version="1.9.0" date="2021-03-20"/>
     <release version="1.8.0" date="2020-02-03"/>
   </releases>
   <content_rating type="oars-1.1"/>
diff --git a/org.viking.Viking.yml b/org.viking.Viking.yml
index 75a6fa26d..725be77b9 100644
--- a/org.viking.Viking.yml
+++ b/org.viking.Viking.yml
@@ -158,8 +158,8 @@ modules:
 # Hence creation of v1.8 flatpak version with a few fixes to get build working.
       - type: git
         url: git://git.code.sf.net/p/viking/code
-        branch: "viking-1.8-flatpak"
-#        branch: "viking-1.9"
+#        branch: "viking-1.8-flatpak"
+        branch: "viking-1.9"
 # Local path for testing
 #      - type: archive
 #        path: viking-1.8.zip
diff --git a/windows/installer/viking-installer.nsi b/windows/installer/viking-installer.nsi
index f2de2ff17..fd2009289 100644
--- a/windows/installer/viking-installer.nsi
+++ b/windows/installer/viking-installer.nsi
@@ -10,7 +10,7 @@ Var name
 ;--------------------------------
 ;Configuration
 ;Needs to be 4 numbers:  W.X.Y.Z
-!define VIKING_VERSION  "1.8.0.0"
+!define VIKING_VERSION  "1.9.0.0"
 
 ;The name var is set in .onInit
 Name $name