[med-svn] [Git][med-team/libedlib][master] 5 commits: No SOVERSION bump

Andreas Tille gitlab at salsa.debian.org
Tue Jan 12 16:45:16 GMT 2021



Andreas Tille pushed to branch master at Debian Med / libedlib


Commits:
4a99decc by Andreas Tille at 2021-01-12T13:56:23+01:00
No SOVERSION bump

- - - - -
1e0443af by Andreas Tille at 2021-01-12T16:32:01+01:00
Fix SOVERSION which is not PROJECTVERSION

- - - - -
c717542c by Andreas Tille at 2021-01-12T16:32:50+01:00
Standards-Version: 4.5.1

- - - - -
2215bc9e by Andreas Tille at 2021-01-12T16:56:10+01:00
Fix patch

- - - - -
8fc55699 by Andreas Tille at 2021-01-12T17:43:30+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/enable_shared_and_static.patch
- debian/patches/series
- debian/patches/soversion.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,8 @@
-libedlib (1.2.6-1) UNRELEASED; urgency=medium
+libedlib (1.2.6-1) unstable; urgency=medium
 
-  * Team Upload.
   [ Andreas Tille ]
   * New upstream version
-  * Standards-Version: 4.5.0 (routine-update)
+  * Standards-Version: 4.5.1 (routine-update)
 
   [ Steffen Moeller ]
   * Added refs to conda and omictools
@@ -14,7 +13,7 @@ libedlib (1.2.6-1) UNRELEASED; urgency=medium
   * Modify d-shlibs for pkgconfig and gnuinstalldirs
   * Rename lib package as per package version
 
- -- Nilesh Patra <npatra974 at gmail.com>  Fri, 08 Jan 2021 13:28:10 +0000
+ -- Andreas Tille <tille at debian.org>  Tue, 12 Jan 2021 16:33:05 +0100
 
 libedlib (1.2.4-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -11,12 +11,12 @@ Build-Depends: debhelper-compat (= 12),
                cython3,
                python3-all-dev,
                python3-setuptools
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/libedlib
 Vcs-Git: https://salsa.debian.org/med-team/libedlib.git
 Homepage: https://github.com/Martinsos/edlib
 
-Package: libedlib1.2.5
+Package: libedlib0
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -53,7 +53,7 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libedlib1.2.5 (= ${binary:Version})
+         libedlib0 (= ${binary:Version})
 Description: library for sequence alignment using edit distance (devel)
  A lightweight and super fast C/C++ library for sequence alignment using
  edit distance.
@@ -85,7 +85,7 @@ Package: edlib-aligner
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libedlib1.2.5 (= ${binary:Version})
+         libedlib0 (= ${binary:Version})
 Description: edlib sequence alignment tool using edit distance
  Edlib is a lightweight and super fast C/C++ library for sequence
  alignment using edit distance.  This package provides an aligner


=====================================
debian/patches/enable_shared_and_static.patch
=====================================
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Last-Update: 2021-01-08
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -14,9 +14,6 @@
+@@ -14,9 +14,6 @@ set(CMAKE_CXX_STANDARD 11)
  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.
  
@@ -14,30 +14,22 @@ Last-Update: 2021-01-08
  # Set strict warnings.
  if(MSVC)
    # Force to always compile with W4
-@@ -47,13 +44,20 @@
+@@ -47,7 +44,13 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMA
  file(GLOB SOURCES "edlib/src/*.cpp")
  
  # Create libraries.
 -add_library(edlib ${SOURCES})
 +add_library(edlib SHARED ${SOURCES})
 +
-+target_include_directories(edlib PUBLIC
++add_library(edlib_static STATIC ${SOURCES})
++target_include_directories(edlib_static PUBLIC
 +    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/edlib/include>
 +    $<INSTALL_INTERFACE:include>)
-+
-+add_library(edlib_static STATIC ${SOURCES})
 +
  set_target_properties(edlib
      PROPERTIES
      VERSION ${PROJECT_VERSION}
-     SOVERSION ${PROJECT_VERSION})
- 
--target_include_directories(edlib PUBLIC
-+target_include_directories(edlib_static PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/edlib/include>
-     $<INSTALL_INTERFACE:include>)
- 
-@@ -71,12 +75,12 @@
+@@ -71,12 +74,12 @@ endif()
  
  if (NOT WIN32) # If on windows, do not build binaries that do not support windows.
    add_executable(edlib-aligner apps/aligner/aligner.cpp)


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
-# soversion.patch
+soversion.patch
 do_not_build_hello_example.patch
 cython3.patch
 # signed_char.patch


=====================================
debian/patches/soversion.patch
=====================================
@@ -4,22 +4,12 @@ Description: Add soversion
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
--project(edlib)
-+project(edlib LANGUAGES CXX VERSION 1.2.3)
- 
- set(MACOSX (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
- 
-@@ -40,6 +40,11 @@ target_include_directories(edlib PUBLIC
- 
- add_library(edlib_static STATIC ${SOURCES})
- 
-+set_target_properties(edlib
-+    PROPERTIES
-+    VERSION ${edlib_VERSION}
+@@ -51,7 +51,7 @@ add_library(edlib ${SOURCES})
+ set_target_properties(edlib
+     PROPERTIES
+     VERSION ${PROJECT_VERSION}
+-    SOVERSION ${PROJECT_VERSION})
 +    SOVERSION 0)
-+
- target_include_directories(edlib_static PUBLIC
+ 
+ target_include_directories(edlib PUBLIC
      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/edlib/include>
-     $<INSTALL_INTERFACE:include>)



View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/b0c302fa9fa0a1a4660c2f45e125b3cbc4fb1288...8fc55699d3031e09e1f60db87d4c288a11e7c012

-- 
View it on GitLab: https://salsa.debian.org/med-team/libedlib/-/compare/b0c302fa9fa0a1a4660c2f45e125b3cbc4fb1288...8fc55699d3031e09e1f60db87d4c288a11e7c012
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/20210112/87897770/attachment-0001.html>


More information about the debian-med-commit mailing list