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

List:       kde-commits
Subject:    ABORT Re: [kdelibs/KDE/4.9] /: KDE SC 4.9.4 version bump
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2012-11-30 20:47:01
Message-ID: 1635478.zVyHh2XJ8z () xps
[Download RAW message or body]

Abort! The change in cmake/modules/KDE4Defaults.cmake is wrong, the soversions 
should not be increased, only in LIB_VERSIONS

Cheers,
  Albert

El Divendres, 30 de novembre de 2012, a les 19:15:44, Torgny Nyblom va 
escriure:
> Git commit f2b156c6532d3dbd112737981e243d125eda0ac4 by Torgny Nyblom.
> Committed on 30/11/2012 at 19:15.
> Pushed by tnyblom into branch 'KDE/4.9'.
> 
> KDE SC 4.9.4 version bump
> 
> M  +1    -1    CMakeLists.txt
> M  +1    -1    README
> M  +4    -4    cmake/modules/KDE4Defaults.cmake
> M  +1    -1    kdecore/sycoca/ksycoca.cpp
> 
> http://commits.kde.org/kdelibs/f2b156c6532d3dbd112737981e243d125eda0ac4
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 889d41c..7da5568 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -10,7 +10,7 @@ include(CPack)
> 
>  set (KDE_VERSION_MAJOR 4)
>  set (KDE_VERSION_MINOR 9)
> -set (KDE_VERSION_RELEASE 3)
> +set (KDE_VERSION_RELEASE 4)
>  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 b46df1b..49f98e5 100644
> --- a/README
> +++ b/README
> @@ -10,7 +10,7 @@ In this file:
> 
>  About kdelibs
>  -------------
> -This is version 4.9.3 of the KDE libraries.
> +This is version 4.9.4 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 bd37e05..da6c201 100644
> --- a/cmake/modules/KDE4Defaults.cmake
> +++ b/cmake/modules/KDE4Defaults.cmake
> @@ -21,12 +21,12 @@ 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
> version n -set(GENERIC_LIB_VERSION "4.9.3")
> -set(GENERIC_LIB_SOVERSION "4")
> +set(GENERIC_LIB_VERSION "4.9.4")
> +set(GENERIC_LIB_SOVERSION "5")
> 
>  # Use this version number for libraries which are already at version n+1 in
> KDE version n -set(KDE_NON_GENERIC_LIB_VERSION "5.9.3")
> -set(KDE_NON_GENERIC_LIB_SOVERSION "5")
> +set(KDE_NON_GENERIC_LIB_VERSION "5.9.4")
> +set(KDE_NON_GENERIC_LIB_SOVERSION "6")
> 
>  # windows does not support LD_LIBRARY_PATH or similar
>  # all searchable directories has to be defined by the PATH environment var
> diff --git a/kdecore/sycoca/ksycoca.cpp b/kdecore/sycoca/ksycoca.cpp
> index 8488fd8..e09accc 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 210
> +#define KSYCOCA_VERSION 211
> 
>  /**
>   * Sycoca file name, used internally (by kbuildsycoca)
[prev in list] [next in list] [prev in thread] [next in thread]