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

List:       kde-commits
Subject:    [kdelibs/KDE/4.12] /: 4.12.5/4.11.9
From:       Torgny Nyblom <nyblom () kde ! org>
Date:       2014-04-28 4:37:53
Message-ID: E1WedKD-0000Xh-2L () scm ! kde ! org
[Download RAW message or body]

Git commit 247e2d8abbef90bc5f31c90ff63c1c17387fa43d by Torgny Nyblom.
Committed on 28/04/2014 at 04:37.
Pushed by tnyblom into branch 'KDE/4.12'.

4.12.5/4.11.9

M  +1    -1    CMakeLists.txt
M  +1    -1    README
M  +2    -2    cmake/modules/KDE4Defaults.cmake
M  +1    -1    kdecore/sycoca/ksycoca.cpp

http://commits.kde.org/kdelibs/247e2d8abbef90bc5f31c90ff63c1c17387fa43d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87fe854..d8a06d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ include(CPack)
 =

 set (KDE_VERSION_MAJOR 4)
 set (KDE_VERSION_MINOR 12)
-set (KDE_VERSION_RELEASE 4)
+set (KDE_VERSION_RELEASE 5)
 set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_=
RELEASE}" )
 set (KDE_VERSION_STRING "${KDE_VERSION}")
 =

diff --git a/README b/README
index 3dd19a9..3592f76 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ In this file:
 =

 About kdelibs
 -------------
-This is version 4.12.4 of the KDE libraries.
+This is version 4.12.5 of the KDE libraries.
 =

 This package includes libraries that are central to the development and
 execution of a KDE program, as well as internationalization files for these
diff --git a/cmake/modules/KDE4Defaults.cmake b/cmake/modules/KDE4Defaults.=
cmake
index b2f768e..16c23a4 100644
--- a/cmake/modules/KDE4Defaults.cmake
+++ b/cmake/modules/KDE4Defaults.cmake
@@ -21,11 +21,11 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 # define the generic version of the libraries here
 # this makes it easy to advance it when the next KDE release comes
 # Use this version number for libraries which are at version n in KDE vers=
ion n
-set(GENERIC_LIB_VERSION "4.12.4")
+set(GENERIC_LIB_VERSION "4.12.5")
 set(GENERIC_LIB_SOVERSION "4")
 =

 # Use this version number for libraries which are already at version n+1 i=
n KDE version n
-set(KDE_NON_GENERIC_LIB_VERSION "5.12.4")
+set(KDE_NON_GENERIC_LIB_VERSION "5.12.5")
 set(KDE_NON_GENERIC_LIB_SOVERSION "5")
 =

 # windows does not support LD_LIBRARY_PATH or similar
diff --git a/kdecore/sycoca/ksycoca.cpp b/kdecore/sycoca/ksycoca.cpp
index da88db1..0bf7fb5 100644
--- a/kdecore/sycoca/ksycoca.cpp
+++ b/kdecore/sycoca/ksycoca.cpp
@@ -55,7 +55,7 @@
  * If the existing file is outdated, it will not get read
  * but instead we'll ask kded to regenerate a new one...
  */
-#define KSYCOCA_VERSION 234
+#define KSYCOCA_VERSION 235
 =

 /**
  * Sycoca file name, used internally (by kbuildsycoca)
[prev in list] [next in list] [prev in thread] [next in thread]