Release v0.6.5.4

Signed-off-by: Henning Rogge <hrogge@googlemail.com>

diff --git a/CHANGELOG b/CHANGELOG
index d75df6d..e1259f0 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,22 @@
+0.6.5.4 -------------------------------------------------------------------
+
+Ferry Huberts (11):
+      Remove mercurial ignore file; we use git
+      build: ignore builddata.c when hashing sources
+      release: fix the list of generated files
+      release: update some comments
+      release: refactor the checkVersionIncrementing function
+      release: do not update the version on master when it's already higher
+      release: only report that master changed when it was actually changed
+      release: checkVersionIncrementing: optionally allow equal versions
+      release: also check against the Makefile version when branching
+      txtinfo: prevent buffer overflow
+      pud: nmealib: _nmea_parse_time not parsing hsec when given "hhmmss" format
+
+Henning Rogge (2):
+      Update version after release of v0.6.5.3
+      Release v0.6.5.4
+
 0.6.5.3 -------------------------------------------------------------------
 
 Ferry Huberts (5):

diff --git a/Makefile b/Makefile
index 8982185..078d36c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@
 # Please also write a new version to:
 # gui/win32/Main/Frontend.rc (line 71, around "CAPTION [...]")
 # gui/win32/Inst/installer.nsi (line 57, around "MessageBox MB_YESNO [...]")
-VERS =         pre-0.6.5.4
+VERS =         0.6.5.4
 
 TOPDIR = .
 INSTALLOVERWRITE ?=

diff --git a/gui/win32/Inst/installer.nsi b/gui/win32/Inst/installer.nsi
index c2da561..0539bba 100644 (file)
--- a/gui/win32/Inst/installer.nsi
+++ b/gui/win32/Inst/installer.nsi
@@ -54,7 +54,7 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 Function .onInit
-        MessageBox MB_YESNO "This will install olsr.org pre-0.6.5.4 on your computer. Continue?" IDYES NoAbort
+        MessageBox MB_YESNO "This will install olsr.org 0.6.5.4 on your computer. Continue?" IDYES NoAbort
         Abort
 NoAbort:
 FunctionEnd

diff --git a/gui/win32/Main/Frontend.rc b/gui/win32/Main/Frontend.rc
index b9f62ee..92e9a4d 100644 (file)
--- a/gui/win32/Main/Frontend.rc
+++ b/gui/win32/Main/Frontend.rc
@@ -68,7 +68,7 @@ IDD_FRONTEND_DIALOG DIALOGEX 0, 0, 399, 289
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | \r
     WS_SYSMENU\r
 EXSTYLE WS_EX_APPWINDOW\r
-CAPTION "olsr.org Switch pre-0.6.5.4"
+CAPTION "olsr.org Switch 0.6.5.4"
 FONT 8, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
     CONTROL         "Tab1",IDC_TAB1,"SysTabControl32",0x0,7,7,383,256\r