summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2017-10-20 13:31:50 +0200
committerDidier Raboud <odyx@debian.org>2017-10-20 13:33:00 +0200
commit7b40e2e3feb6f6b2c114f43412912dea9560519f (patch)
tree12d145d5ed1306d67637217e1c2ffee6b5b95735 /debian
parent5a5fb232d815ab77bf0894b26733b996cdce0e10 (diff)
parent48c7daa8e91d96805548ef4d2fa9f4b925c26108 (diff)
record new upstream branch
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm14
-rw-r--r--debian/patches/0001-Use-CMAKE_INSTALL-targets.patch28
-rw-r--r--debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch46
-rw-r--r--debian/patches/series2
4 files changed, 7 insertions, 83 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 01d1c43..cc8f7cb 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-ce28aad319fe187c895e1319280c5e53d6648168
-ce28aad319fe187c895e1319280c5e53d6648168
-fcd6aa3adfacc7914455ccd229682e009a06c447
-fcd6aa3adfacc7914455ccd229682e009a06c447
-sdl-kitchensink_0.0.6.orig.tar.xz
-2c0b2296a6a3cfa9d8f9a0a0f15e3c8f17e017b5
-3619160
+48c7daa8e91d96805548ef4d2fa9f4b925c26108
+48c7daa8e91d96805548ef4d2fa9f4b925c26108
+48c7daa8e91d96805548ef4d2fa9f4b925c26108
+48c7daa8e91d96805548ef4d2fa9f4b925c26108
+sdl-kitchensink_0.0.7.orig.tar.gz
+8732427fdaf541cc768d9a26e426d371c74d3753
+3646266
diff --git a/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch b/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch
deleted file mode 100644
index f9c0190..0000000
--- a/debian/patches/0001-Use-CMAKE_INSTALL-targets.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7c18afb0d02de40da3aa20540516b01fddf904df Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Mon, 11 Sep 2017 10:46:39 +0200
-Subject: Use CMAKE_INSTALL targets
-
----
- CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 148c747..33758f3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,10 +76,11 @@ if(BUILD_EXAMPLES)
- endif()
-
- # Installation
-+include(GNUInstallDirs)
-
- INSTALL(FILES ${HEADERS} DESTINATION include/kitchensink/)
- INSTALL(TARGETS SDL_kitchensink SDL_kitchensink_static
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
diff --git a/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch b/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch
deleted file mode 100644
index 3a1fcab..0000000
--- a/debian/patches/0002-Set-VERSION-and-SOVERSION-properly.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ce28aad319fe187c895e1319280c5e53d6648168 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
-
-Origin: upstream
-Applied-Upstream: 09cf13b9256c8bc599188cb2f2c6f8322d632abb
-Bug-Upstream: https://github.com/katajakasa/SDL_kitchensink/issues/25
----
- 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
deleted file mode 100644
index 1b54ae0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Use-CMAKE_INSTALL-targets.patch
-0002-Set-VERSION-and-SOVERSION-properly.patch