[med-svn] [Git][med-team/libedlib][master] 6 commits: Enable building shared libs; upstream defaults this to OFF

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Med / libedlib


Commits:
890f6639 by tony mancill at 2021-12-29T15:11:29-08:00
Enable building shared libs; upstream defaults this to OFF

- - - - -
a9a5c7ca by tony mancill at 2021-12-29T15:11:29-08:00
Update symbols file for libedlib1

- - - - -
1f3f3ad4 by tony mancill at 2021-12-29T15:11:29-08:00
Adjust enabled_shared_and_static.patch

We can specify BUILD_SHARED_LIBS in debian/rules.
This is related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996541

- - - - -
ecb21383 by tony mancill at 2021-12-29T16:12:27-08:00
Freshen years in debian/copyright

- - - - -
96246f35 by tony mancill at 2021-12-29T16:18:33-08:00
Add Build-Depends-Package metadata to libedlib1.symbols (lintian)

- - - - -
850b04a3 by tony mancill at 2021-12-29T16:18:33-08:00
Prepare changelog for upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/copyright
- debian/libedlib0.symbols → debian/libedlib1.symbols
- debian/patches/enable_shared_and_static.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,18 @@
-libedlib (1.2.7-3) UNRELEASED; urgency=medium
+libedlib (1.2.7-3) unstable; urgency=medium
 
+  [ Nilesh Patra ]
   * Team Upload.
   * Fix version of package in CMakeLists.txt
 
- -- Nilesh Patra <nilesh at debian.org>  Mon, 20 Dec 2021 02:01:21 +0530
+  [ tony mancill ]
+  * Enable building shared libs; upstream defaults this to OFF
+    (Closes: #996541)
+  * Update symbols file for libedlib1
+  * Adjust enabled_shared_and_static.patch
+  * Freshen years in debian/copyright
+  * Add Build-Depends-Package metadata to libedlib1.symbols (lintian)
+
+ -- tony mancill <tmancill at debian.org>  Wed, 29 Dec 2021 16:18:05 -0800
 
 libedlib (1.2.7-2) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -3,11 +3,12 @@ Upstream-Name: edlib
 Source: https://github.com/Martinsos/edlib/releases
 
 Files: *
-Copyright: 2014-2018 Martin Šošić
+Copyright: 2014-2021 Martin Šošić
 License: MIT
 
 Files: debian/*
-Copyright: 2018 Andreas Tille <tille at debian.org>
+Copyright: 2018-2021 Andreas Tille <tille at debian.org>
+	   2021 tony mancill <tmancill at debian.org>
 License: MIT
 
 License: MIT


=====================================
debian/libedlib0.symbols → debian/libedlib1.symbols
=====================================
@@ -1,6 +1,5 @@
-libedlib.so.0 libedlib0 #MINVER#
- _ZN18EqualityDefinitionC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPK17EdlibEqualityPairi at Base 1.2.3
- _ZN18EqualityDefinitionC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPK17EdlibEqualityPairi at Base 1.2.3
+libedlib.so.1 libedlib1 #MINVER#
+* Build-Depends-Package: libedlib-dev
  _ZNSt6vectorIcSaIcEE17_M_realloc_insertIJRKcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 1.2.4
  _ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 1.2.4
  _ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_ at Base 1.2.3


=====================================
debian/patches/enable_shared_and_static.patch
=====================================
@@ -1,20 +1,11 @@
 Description: Enable building both shared and static library for d-shlibs
-Author: Nilesh Patra <npatra974 at gmail.com>
+Author: Nilesh Patra <npatra974 at gmail.com>,
+        tony mancill <tmancill at debian.org>
 Forwarded: not-needed
-Last-Update: 2021-01-08
+Last-Update: 2021-12-29
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -18,9 +18,6 @@ set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)  # Falling back to different standard it not allowed.
- set(CMAKE_CXX_EXTENSIONS OFF)  # Make sure no compiler-specific features are used.
- 
--# Build edlib as static library by default
--set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build all libraries as shared")
--
- # Set strict warnings.
- if(MSVC)
-   # Force to always compile with W4
-@@ -51,7 +48,13 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMA
+@@ -51,7 +51,13 @@
  file(GLOB SOURCES "edlib/src/*.cpp")
  
  # Create libraries.
@@ -29,7 +20,7 @@ Last-Update: 2021-01-08
  add_library(edlib::edlib ALIAS edlib)
  set_target_properties(edlib
    PROPERTIES
-@@ -87,7 +90,7 @@ endif()
+@@ -87,7 +93,7 @@
  if(EDLIB_BUILD_UTILITIES)
    if(NOT WIN32) # If on windows, do not build binaries that do not support windows.
      add_executable(edlib-aligner apps/aligner/aligner.cpp)
@@ -38,7 +29,7 @@ Last-Update: 2021-01-08
    endif()
  endif()
  
-@@ -136,7 +139,7 @@ if(EDLIB_ENABLE_INSTALL)
+@@ -136,7 +142,7 @@
    
    # Create target 'install' for installing libraries.
    install(


=====================================
debian/rules
=====================================
@@ -9,7 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release \
                         -DEDLIB_BUILD_EXAMPLES=False \
                         -DBUILD_TESTING=False \
-                        -DEDLIB_OMIT_README_RST=1
+                        -DEDLIB_OMIT_README_RST=1 \
+                        -DBUILD_SHARED_LIBS=ON
 EDLIB_OMIT_README_RST=1
 
 %:



View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/020dfaf2894be5ee7fc441f64123a53ddd369ead...850b04a3ec2bade77537d6d0b4f0e0575bee081f

-- 
View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/020dfaf2894be5ee7fc441f64123a53ddd369ead...850b04a3ec2bade77537d6d0b4f0e0575bee081f
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/20211230/fb117a5a/attachment-0001.htm>