Adjust for release.v1.6.2

5 files changed, 13 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3082e1b..66261d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Changes from Konversation 1.6.1 to 1.6.2:
+Konversation 1.6.2 is a hotfix release that fixes an unfortunate severe
+crash condition that crept into 1.6.1.
+
+* Fixed a bug causing various operations on server list data to crash, e.g.
+  pressing "Edit" on a server sub-item in the Server List dialog.
+* Translations for AppData metadata added in v1.6.1.
+
 Changes from Konversation 1.6 to 1.6.1:
 Konversation 1.6.1 is a maintenance release that contains various bug fixes
 for the stable KDE Frameworks 5-based version of Konversation.
diff --git a/src/commit.h b/src/commit.h
index a75f40f..1187fd8 100644
--- a/src/commit.h
+++ b/src/commit.h
@@ -1,4 +1,4 @@
 // This COMMIT number is added to version string to be used as "patch level"
 #ifndef COMMIT
-#define COMMIT 4910
+#define COMMIT 4911
 #endif
diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
index 2b02162..f55647c 100644
--- a/src/irc/inputfilter.cpp
+++ b/src/irc/inputfilter.cpp
@@ -16,7 +16,6 @@
 #include "replycodes.h"
 #include "application.h"
 #include "version.h"
-#include "commit.h"
 #include "query.h"
 #include "channel.h"
 #include "statuspanel.h"
@@ -309,9 +308,8 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma
                     else
                     {
                         // Do not internationalize the below version string
-                        reply = QString(QStringLiteral("Konversation %1 Build %2 (C) 2002-2015 by the Konversation team"))
-                            .arg(QStringLiteral(KONVI_VERSION))
-                            .arg(QString::number(COMMIT));
+                        reply = QString(QStringLiteral("Konversation %1 (C) 2002-2016 by the Konversation team"))
+                            .arg(QStringLiteral(KONVI_VERSION));
 
                     }
 
diff --git a/src/main.cpp b/src/main.cpp
index 8b4fd0f..eb77852 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,6 @@
 
 #include "application.h"
 #include "version.h"
-#include "commit.h"
 
 #include <QMutex>
 #include <QWaitCondition>
@@ -26,9 +25,6 @@
 #include <Kdelibs4ConfigMigrator>
 #include <KDBusAddons/KDBusService>
 
-#define HACKSTR(x) #x
-#define STRHACK(x) HACKSTR(x)
-
 int main(int argc, char* argv[])
 {
 
@@ -50,7 +46,7 @@ int main(int argc, char* argv[])
 
     KAboutData aboutData("konversation",
         i18n("Konversation"),
-        KONVI_VERSION " #" STRHACK(COMMIT),
+        KONVI_VERSION,
         i18n("A user-friendly IRC client"),
         KAboutLicense::GPL,
         i18n("(C) 2002-2016 by the Konversation team"),
diff --git a/src/version.h b/src/version.h
index f29e244..5d88222 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #ifndef KONVI_VERSION
-#define KONVI_VERSION "1.6-branch"
+#define KONVI_VERSION "1.6.2"
 #endif