diff options
| author | Didier Raboud <odyx@debian.org> | 2017-09-13 09:04:02 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2017-09-13 09:04:02 +0200 |
| commit | 15d085a829342bf29dce175f533a91444c14a831 (patch) | |
| tree | 3e592a8d86814b0031e282c78bf7530f07670f9d /debian | |
| parent | 9e02955ec09333fb453642ee93de1fe3fc730933 (diff) | |
| parent | d7d7365e73ad4922e5d96f4085fa07658c841bfb (diff) | |
merge patched-debian/master into debian/master
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch | 43 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 46 insertions, 2 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 1b19576..a22343c 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -7c18afb0d02de40da3aa20540516b01fddf904df -7c18afb0d02de40da3aa20540516b01fddf904df +d7d7365e73ad4922e5d96f4085fa07658c841bfb +d7d7365e73ad4922e5d96f4085fa07658c841bfb fcd6aa3adfacc7914455ccd229682e009a06c447 fcd6aa3adfacc7914455ccd229682e009a06c447 sdl-kitchensink_0.0.6.orig.tar.xz diff --git a/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch b/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch new file mode 100644 index 0000000..2588193 --- /dev/null +++ b/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch @@ -0,0 +1,43 @@ +From d7d7365e73ad4922e5d96f4085fa07658c841bfb Mon Sep 17 00:00:00 2001 +From: Tuomas Virtanen <katajakasa@gmail.com> +Date: Mon, 11 Sep 2017 21:05:54 +0300 +Subject: Set VERSION and SOVERSION properly + +--- + CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33758f3..14e4e3b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.0) + project(SDL_kitchensink C) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) + +-set(VERSION_MAJOR "0") +-set(VERSION_MINOR "0") +-set(VERSION_PATCH "6") ++set(KIT_VERSION_MAJOR "0") ++set(KIT_VERSION_MINOR "0") ++set(KIT_VERSION_PATCH "6") ++set(KIT_VERSION ${KIT_VERSION_MAJOR}.${KIT_VERSION_MINOR}.${KIT_VERSION_PATCH}) + add_definitions( +- -DKIT_VERSION_MAJOR=${VERSION_MAJOR} +- -DKIT_VERSION_MINOR=${VERSION_MINOR} +- -DKIT_VERSION_PATCH=${VERSION_PATCH} ++ -DKIT_VERSION_MAJOR=${KIT_VERSION_MAJOR} ++ -DKIT_VERSION_MINOR=${KIT_VERSION_MINOR} ++ -DKIT_VERSION_PATCH=${KIT_VERSION_PATCH} + ) + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99") +@@ -41,6 +42,8 @@ FILE(GLOB HEADERS "include/kitchensink/*.h") + add_library(SDL_kitchensink SHARED ${SOURCES}) + add_library(SDL_kitchensink_static STATIC ${SOURCES}) + ++set_target_properties(SDL_kitchensink PROPERTIES VERSION ${KIT_VERSION}) ++set_target_properties(SDL_kitchensink PROPERTIES SOVERSION ${KIT_VERSION_MAJOR}) + set_target_properties(SDL_kitchensink PROPERTIES DEBUG_POSTFIX "d") + set_target_properties(SDL_kitchensink_static PROPERTIES DEBUG_POSTFIX "d") + target_compile_definitions(SDL_kitchensink PRIVATE "KIT_DLL;KIT_DLL_EXPORTS") diff --git a/debian/patches/series b/debian/patches/series index a32d16a..1b54ae0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Use-CMAKE_INSTALL-targets.patch +0002-Set-VERSION-and-SOVERSION-properly.patch |