[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation
From:       Eike Hein <hein () kde ! org>
Date:       2006-10-06 18:10:51
Message-ID: 1160158251.037320.32752.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 593072 by hein:

Bump version and build number, add build number back to About 
and CTCP version reply, bootstrap the changelog for post-1.0.1 
changes.


 M  +5 -0      ChangeLog  
 M  +1 -1      src/commit.h  
 M  +3 -2      src/inputfilter.cpp  
 M  +4 -1      src/main.cpp  
 M  +1 -1      src/version.h  


--- trunk/extragear/network/konversation/ChangeLog #593071:593072
@@ -1,3 +1,8 @@
+Changes since 1.0.1:
+None yet.
+
+-------------------------------------------------------------------------------
+
 Changes from 1.0 to 1.0.1
 We are pleased to announce the immediate availability of Konversation 1.0.1,
 a maintenance release featuring notable improvements for users of right-to-
--- trunk/extragear/network/konversation/src/commit.h #593071:593072
@@ -1,4 +1,4 @@
 // This COMMIT number is added to version string to be used as "patch level"
 #ifndef COMMIT
-#define COMMIT 3183
+#define COMMIT 3184
 #endif
--- trunk/extragear/network/konversation/src/inputfilter.cpp #593071:593072
@@ -240,8 +240,9 @@
                     else
                     {
                         // Do not internationalize the below version string
-                        reply = QString("Konversation %1 (C) 2002-2006 by the \
                Konversation team")
-                            .arg(QString(KONVI_VERSION));
+                        reply = QString("Konversation %1 Build %2 (C) 2002-2006 by \
the Konversation team") +                            .arg(QString(KONVI_VERSION))
+                            .arg(QString::number(COMMIT));
                     }
                     server->ctcpReply(sourceNick,"VERSION "+reply);
                 }
--- trunk/extragear/network/konversation/src/main.cpp #593071:593072
@@ -24,6 +24,9 @@
 #include "version.h"
 #include "commit.h"
 
+#define HACKSTR(x) #x
+#define STRHACK(x) HACKSTR(x)
+
 /*
   Don't use i18n() here, use I18N_NOOP() instead!
   i18n() will only work as soon as a kapplication object was made.
@@ -46,7 +49,7 @@
 {
     KAboutData aboutData("konversation",
         I18N_NOOP("Konversation"),
-        KONVI_VERSION,
+        KONVI_VERSION " #" STRHACK(COMMIT),
         shortDescription,
         KAboutData::License_GPL,
         I18N_NOOP("(C) 2002-2006 by the Konversation team"),
--- trunk/extragear/network/konversation/src/version.h #593071:593072
@@ -1,3 +1,3 @@
 #ifndef KONVI_VERSION
-#define KONVI_VERSION "1.0.1"
+#define KONVI_VERSION "1.0.1+"
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]