From 51d6704c619e91380db66affe45dd2b872e7803c Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Tue, 24 Nov 2015 22:24:58 +0000
Subject: [PATCH] Releasing Viking 1.6.1

---
 NEWS                                 | 17 +++++++++++++++++
 configure.ac                         |  2 +-
 help/C/viking.xml                    |  6 +++---
 help/viking.xml.in                   |  2 +-
 win32/installer/viking-installer.nsi |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index b32e652f..d5814abd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Viking 1.6.1 (2015-11-24)
+Bug Fix Release + updated translations
+* Several fixes and many code improvements from Coverity scans
+* Fix heap-buffer-overflows
+* Mapnik3 support.
+** C++ standard required is now C++11
+* Reactivate building of the reference documentation
+* SF Bugs#126: Fix crash in gdk_rgb_convert_0888 due to using deallocated memory.
+* SF Bugs#121: Fix crash when invalidating previously acquired tiles.
+* SF Bugs#123: Fix bzip2 decompression on Windows.
+* SF Bugs#122: Fix memory cache confusion with multiple "On Disk OSM Tile Format" maps
+* SF Bugs#120: Fix Track drawing bug across the 180th Meridian.
+* Red Hat Bugzilla – Bug 1210403: Only download and process one Bing attribution list.
+* Fix Geocaches acquiring with latest geo-* software
+* Import latest Launchpad translation updates
+* Many other small fixes - see the ChangeLog for the full details.
+
 Viking 1.6 (2015-03-29)
 New features since 1.5.1
 * Mapnik Rendering Layer (not available in Windows build ATM) - with preprocessor CartoCSS option.
diff --git a/configure.ac b/configure.ac
index 6591cc9b..198de165 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.6, , viking, http://viking.sf.net/)
+AC_INIT(viking, 1.6.1, , viking, http://viking.sf.net/)
 AM_INIT_AUTOMAKE([dist-bzip2 dist-zip subdir-objects])
 dnl AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([src/config.h])
diff --git a/help/C/viking.xml b/help/C/viking.xml
index 2145a0c4..4ba1ef88 100644
--- a/help/C/viking.xml
+++ b/help/C/viking.xml
@@ -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.6">
-  <!ENTITY manrevision  "1.6">
-  <!ENTITY date "March 2015">
+  <!ENTITY appversion   "1.6.1">
+  <!ENTITY manrevision  "1.6.1">
+  <!ENTITY date "November 2015">
 ]>
 <!--
       (Do not remove this comment block.)
diff --git a/help/viking.xml.in b/help/viking.xml.in
index ebc2de37..b217e7c0 100644
--- a/help/viking.xml.in
+++ b/help/viking.xml.in
@@ -30,7 +30,7 @@ and docbook-xsl in your Build-Depends control field.
   <!ENTITY dhfirstname "<firstname>Ralf</firstname>">
   <!ENTITY dhsurname   "<surname>Meyer</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>2015-03-29</date>">
+  <!ENTITY dhdate      "<date>2015-11-24</date>">
   <!ENTITY dhsource      "Viking">
   <!ENTITY dhversion     "@PACKAGE_VERSION@">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 0a1b9c56..c31f05ca 100644
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -10,7 +10,7 @@ Var name
 ;--------------------------------
 ;Configuration
 ;Needs to be 4 numbers:  W.X.Y.Z
-!define VIKING_VERSION  "1.6.0.0"
+!define VIKING_VERSION  "1.6.1.0"
 
 ;The name var is set in .onInit
 Name $name
-- 
2.39.5