[med-svn] [Git][med-team/libthread-pool][master] 2 commits: Revert unintended changes on upstream source

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libthread-pool


Commits:
2b568824 by Andreas Tille at 2018-06-10T09:34:10+02:00
Revert unintended changes on upstream source

- - - - -
8b993224 by Andreas Tille at 2018-06-10T09:38:57+02:00
Soversion and other fixes

- - - - -


5 changed files:

- CMakeLists.txt
- debian/control
- debian/patches/series
- + debian/patches/soversion.patch
- debian/rules


Changes:

=====================================
CMakeLists.txt
=====================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,22 +11,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(thread_pool_build_tests "Build thread_pool unit tests" OFF)
 
-add_library(thread_pool SHARED
-    src/thread_pool.cpp)
-
-add_library(thread_pool_static STATIC
+add_library(thread_pool STATIC
     src/thread_pool.cpp)
 
 target_include_directories(thread_pool PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>)
 
-target_include_directories(thread_pool_static PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>)
-
 install(TARGETS thread_pool DESTINATION lib)
-install(TARGETS thread_pool_static DESTINATION lib)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/thread_pool DESTINATION include)
 
 if (thread_pool_build_tests)


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: https://salsa.debian.org/med-team/libthread-pool
 Vcs-Git: https://salsa.debian.org/med-team/libthread-pool.git
 Homepage: https://github.com/rvaser/libthread-pool
 
-Package: liblibthread-pool1
+Package: liblibthread-pool0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -28,12 +28,12 @@ Description: C++ thread pool library
  This package contains a shared library with a thread pool
  implementation.
 
-Package: liblibthread-pool-dev
+Package: libthread-pool-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         liblibthread-pool1.1.3 (= ${binary:Version})
+         liblibthread-pool0 (= ${binary:Version})
 Description: C++ thread pool library (devel)
  A thread pool is a software design pattern for achieving concurrency of
  execution in a computer program. Often also called a replicated workers


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 shared_and_static.patch
+soversion.patch


=====================================
debian/patches/soversion.patch
=====================================
--- /dev/null
+++ b/debian/patches/soversion.patch
@@ -0,0 +1,25 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update:  Fri, 08 Jun 2018 13:20:51 +0200
+Description: Add soversion
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.2)
+-project(thread_pool)
++project(thread_pool LANGUAGES CXX VERSION 1.0.0)
+ 
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+@@ -17,6 +17,11 @@ add_library(thread_pool SHARED
+ add_library(thread_pool_static STATIC
+     src/thread_pool.cpp)
+ 
++set_target_properties(thread_pool
++    PROPERTIES
++    VERSION ${thread_pool_VERSION}
++    SOVERSION 0)
++
+ target_include_directories(thread_pool PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+     $<INSTALL_INTERFACE:include>)


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -16,4 +16,4 @@ override_dh_install:
 		    --devunversioned \
 		    --exclude-la \
 		    --movedev debian/tmp/usr/include/* usr/include \
-		    debian/tmp/usr/lib/*/*.so
+		    debian/tmp/usr/lib/*.so



View it on GitLab: https://salsa.debian.org/med-team/libthread-pool/compare/4f130c64ae1ed3412fa4a53fe8c673295d9f97e4...8b993224ee1fc5e47e17709f787fb2b9ef30ba08

-- 
View it on GitLab: https://salsa.debian.org/med-team/libthread-pool/compare/4f130c64ae1ed3412fa4a53fe8c673295d9f97e4...8b993224ee1fc5e47e17709f787fb2b9ef30ba08
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180610/7959088f/attachment-0001.html>