Use kdepim-version.h instead of our own stuff.

svn path=/trunk/KDE/kdepim/kmail/; revision=1084330

CMakeLists.txt

@@ -4,21 +4,6 @@ include(CheckIncludeFiles)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
 
-# Support for the SVN revision number in version-kmail.h
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
-  if (NOT KdeSubversion_FOUND)
-    find_package(KdeSubversion)
-  endif (NOT KdeSubversion_FOUND)
-  if (KdeSubversion_FOUND)
-    KdeSubversion_WC_INFO(${PROJECT_SOURCE_DIR} KMail)
-    string(SUBSTRING "${KMail_WC_LAST_CHANGED_DATE}" 0 10 KMail_WC_LAST_CHANGED_DATE)
-    set(kmail_svn_revision "svn-${KMail_WC_REVISION}")
-    set(kmail_svn_last_change "${KMail_WC_LAST_CHANGED_DATE}")
-  endif (KdeSubversion_FOUND)
-endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
-
-configure_file(version-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kmail.h)
-
 qt4_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
 
 add_custom_target(kmail_xml ALL

messagehelper.cpp

@@ -21,7 +21,7 @@
 #include "messagehelper.h"
 #include "stringutil.h"
 #include "messageviewer/stringutil.h"
-#include "version-kmail.h"
+#include "kdepim-version.h"
 #include "kmversion.h"
 #include "templateparser.h"
 #include "messageinfo.h"
@@ -149,11 +149,11 @@ void initHeader( const KMime::Message::Ptr &message, uint id )
 
   // user agent, e.g. KMail/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; 2008-01-15)
   QStringList extraInfo;
-# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE
-  extraInfo << KMAIL_SVN_REVISION_STRING << KMAIL_SVN_LAST_CHANGE;
+#if defined KDEPIM_SVN_REVISION_STRING && defined KDEPIM_SVN_LAST_CHANGE
+  extraInfo << KDEPIM_SVN_REVISION_STRING << KDEPIM_SVN_LAST_CHANGE;
 #else
-#error forgot to include version-kmail.h
-# endif
+#error forgot to include kdepim-version.h
+#endif
 
   message->userAgent()->fromUnicodeString( KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo ), "utf-8" );
 

version-kmail.h.cmake

@@ -1,3 +0,0 @@
-#define KMAIL_SVN_REVISION_STRING "@kmail_svn_revision@"
-
-#define KMAIL_SVN_LAST_CHANGE "@kmail_svn_last_change@"