From 23d27de1430fb9c77af38fa6cddcf1c0b3b39cde Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 16 Jul 2009 01:15:05 +0200
Subject: [PATCH] Change version string to be more intuitive

Having 0.4.0+ for git master confuses users. So let's use a version string like
v0.5-pre (0.4.0+198 git-dee6c47*) instead, which still gives us all the information
and is less confusing.

Version is obtained from version.inc.
---
 src/common/quassel.cpp | 13 ++++++-------
 version.inc            |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 20754afc..f890740d 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -170,8 +170,7 @@ void Quassel::setupBuildInfo(const QString &generated) {
       _buildInfo.plainVersionString = QString("v%1 (dist-%2)")
                                         .arg(_buildInfo.baseVersion)
                                         .arg(_buildInfo.commitHash.left(7));
-                                        _buildInfo.fancyVersionString
-                                           = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
+      _buildInfo.fancyVersionString = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
                                         .arg(_buildInfo.baseVersion)
                                         .arg(_buildInfo.commitHash.left(7))
                                         .arg(_buildInfo.commitHash);
@@ -183,13 +182,13 @@ void Quassel::setupBuildInfo(const QString &generated) {
     // analyze what we got from git-describe
     QRegExp rx("(.*)-(\\d+)-g([0-9a-f]+)$");
     if(rx.exactMatch(_buildInfo.generatedVersion)) {
-      QString distance = rx.cap(2) == "0" ? QString() : QString(" [+%1]").arg(rx.cap(2));
-      _buildInfo.plainVersionString = QString("v%1%2 (git-%3%4)")
-                                        .arg(rx.cap(1), distance, rx.cap(3))
+      QString distance = rx.cap(2) == "0" ? QString() : QString("%1+%2 ").arg(rx.cap(1), rx.cap(2));
+      _buildInfo.plainVersionString = QString("v%1 (%2git-%3%4)")
+                                        .arg(_buildInfo.baseVersion, distance, rx.cap(3))
                                         .arg(_buildInfo.isSourceDirty ? "*" : "");
       if(!_buildInfo.commitHash.isEmpty()) {
-        _buildInfo.fancyVersionString = QString("v%1%2 (git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
-                                          .arg(rx.cap(1), distance, rx.cap(3))
+        _buildInfo.fancyVersionString = QString("v%1 (%2git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
+                                          .arg(_buildInfo.baseVersion, distance, rx.cap(3))
                                           .arg(_buildInfo.isSourceDirty ? "*" : "")
                                           .arg(_buildInfo.commitHash);
       }
diff --git a/version.inc b/version.inc
index ee0ccc5b..f9f0f568 100644
--- a/version.inc
+++ b/version.inc
@@ -1,5 +1,5 @@
 //! This is the fallback version number in case we can't autogenerate one
-baseVersion = "0.4.2";
+baseVersion = "0.4";
 
 protocolVersion = 9;       //< Version of the client/core protocol
 coreNeedsProtocol   = 9;   //< Minimum protocol version the core needs
-- 
2.20.1