From 59bd8c9ad6f4ba90174fa56a09a49adcb07097b1 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Sun, 30 Nov 2014 17:48:50 +0100
Subject: [PATCH 01/24] Bump for post-release.

---
 src/commit.h            | 2 +-
 src/irc/inputfilter.cpp | 6 ++++--
 src/main.cpp            | 3 ++-
 src/version.h           | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/commit.h b/src/commit.h
index 1372a4e..6f62ad9 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 4903
+#define COMMIT 4904
 #endif
diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
index a32fa26..281ea33 100644
--- a/src/irc/inputfilter.cpp
+++ b/src/irc/inputfilter.cpp
@@ -16,6 +16,7 @@
 #include "replycodes.h"
 #include "application.h"
 #include "version.h"
+#include "commit.h"
 #include "query.h"
 #include "channel.h"
 #include "statuspanel.h"
@@ -308,8 +309,9 @@ void InputFilter::parseClientCommand(const QString &prefix, const QString &comma
                     else
                     {
                         // Do not internationalize the below version string
-                        reply = QString(QStringLiteral("Konversation %1 (C) 2002-2014 by the Konversation team"))
-                            .arg(QStringLiteral(KONVI_VERSION));
+                        reply = QString(QStringLiteral("Konversation %1 Build #2 (C) 2002-2014 by the Konversation team"))
+                            .arg(QStringLiteral(KONVI_VERSION))
+                            .arg(QString::number(COMMIT));
 
                     }
 
diff --git a/src/main.cpp b/src/main.cpp
index f492301..66d709d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,6 +15,7 @@
 
 #include "application.h"
 #include "version.h"
+#include "commit.h"
 
 #include <QMutex>
 #include <QWaitCondition>
@@ -46,7 +47,7 @@ int main(int argc, char* argv[])
 
     KAboutData aboutData("konversation",
         i18n("Konversation"),
-        KONVI_VERSION,
+        KONVI_VERSION " #" STRHACK(COMMIT),
         i18n("A user-friendly IRC client"),
         KAboutLicense::GPL,
         i18n("(C) 2002-2014 by the Konversation team"),
diff --git a/src/version.h b/src/version.h
index 4e208d4..f29e244 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #ifndef KONVI_VERSION
-#define KONVI_VERSION "1.6-beta1"
+#define KONVI_VERSION "1.6-branch"
 #endif
-- 
2.1.0