[med-svn] [Git][med-team/libxdf][master] 7 commits: Fix watchfile to detect new versions on github

Andreas Tille (@tille) gitlab at salsa.debian.org
Fri Oct 1 15:24:18 BST 2021 


Andreas Tille pushed to branch master at Debian Med / libxdf


Commits:
5a2ad1e1 by Andreas Tille at 2021-10-01T16:20:12+02:00
Fix watchfile to detect new versions on github

- - - - -
a5e40d5f by Andreas Tille at 2021-10-01T16:20:17+02:00
New upstream version 0.99.8+dfsg
- - - - -
45d33174 by Andreas Tille at 2021-10-01T16:20:17+02:00
routine-update: New upstream version

- - - - -
f15922ec by Andreas Tille at 2021-10-01T16:20:18+02:00
Update upstream source from tag 'upstream/0.99.8+dfsg'

Update to upstream version '0.99.8+dfsg'
with Debian dir ff4f28ac1114199e03de535f9bab4316d751d7ce
- - - - -
2400af74 by Andreas Tille at 2021-10-01T16:20:18+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
cdf1aa16 by Andreas Tille at 2021-10-01T16:22:43+02:00
Update patches

- - - - -
dd208954 by Andreas Tille at 2021-10-01T16:23:49+02:00
Upload to unstable

- - - - -


9 changed files:

- CMakeLists.txt
- README.md
- debian/changelog
- debian/control
- − debian/patches/cmake_config_file.patch
- debian/patches/series
- debian/patches/shared_and_static.patch
- debian/watch
- xdf.pro


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.7)
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 
 project(libxdf
-        VERSION 0.99.6
+        VERSION 0.99.8
         DESCRIPTION "C++ library for loading multimodal, multi-rate signals stored in XDF files."
         HOMEPAGE_URL https://xdf-modules.github.io/libxdf/)
 
@@ -26,11 +26,14 @@ set(SOURCES
 )
 
 add_library(xdf ${SOURCES})
+add_library(xdf_shared SHARED ${SOURCES})
+set_target_properties(xdf_shared PROPERTIES SOVERSION 0)
 
 find_package(pugixml 1.9 QUIET)
 if(TARGET pugixml AND NOT XDF_NO_SYSTEM_PUGIXML)
 	message(STATUS "Using system pugixml")
 	target_link_libraries(xdf PRIVATE pugixml)
+	target_link_libraries(xdf_shared PRIVATE pugixml::shared)
 else()
 	message(STATUS "Using bundled pugixml")
 	target_sources(xdf PRIVATE pugixml/pugixml.cpp)
@@ -39,6 +42,7 @@ endif()
 
 target_compile_features(xdf PUBLIC cxx_std_11)
 set_target_properties(xdf PROPERTIES OUTPUT_NAME xdf PUBLIC_HEADER xdf.h)
+set_target_properties(xdf_shared PROPERTIES OUTPUT_NAME xdf PUBLIC_HEADER xdf.h)
 target_include_directories(xdf PUBLIC
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
 	$<INSTALL_INTERFACE:include>
@@ -50,10 +54,16 @@ install(TARGETS xdf
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
+install(TARGETS xdf_shared
+        EXPORT "${PROJECT_NAME}Config"
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
 install(EXPORT "${PROJECT_NAME}Config"
 	COMPONENT ${PROJECT_NAME}
 	NAMESPACE "XDF::"
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
 # set(CPACK_STRIP_FILES ON)


=====================================
README.md
=====================================
@@ -1,4 +1,4 @@
-# Libxdf - a C++ library for loading [XDF](https://github.com/sccn/xdf/wiki/Specifications "Extensible Data Format") files
+# Libxdf – a C++ library for loading [XDF](https://github.com/sccn/xdf/wiki/Specifications "Extensible Data Format") files
 
 [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
 [![License](https://img.shields.io/github/license/xdf-modules/libxdf)](https://opensource.org/licenses/BSD-2-Clause)


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libxdf (0.99.8+dfsg-1) unstable; urgency=medium
+
+  * Fix watchfile to detect new versions on github
+  * New upstream version
+  * Standards-Version: 4.6.0 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Fri, 01 Oct 2021 16:23:11 +0200
+
 libxdf (0.99.6+dfsg-3) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                cmake,
                d-shlibs,
                libpugixml-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/libxdf
 Vcs-Git: https://salsa.debian.org/med-team/libxdf.git
 Homepage: https://github.com/Yida-Lin/libxdf


=====================================
debian/patches/cmake_config_file.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Author: Juhani Numminen <juhaninumminen0 at gmail.com>
-Last-Update: Tue, 05 Jan 2021 13:34:00 +0200
-Description: install CMake package config files in a multiarch-friendly path
-Forwarded: https://github.com/xdf-modules/libxdf/pull/32
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,7 +63,7 @@
- install(EXPORT "${PROJECT_NAME}Config"
- 	COMPONENT ${PROJECT_NAME}
- 	NAMESPACE "XDF::"
--	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
- )
- 
- # set(CPACK_STRIP_FILES ON)


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
 shared_and_static.patch
-cmake_config_file.patch


=====================================
debian/patches/shared_and_static.patch
=====================================
@@ -4,7 +4,7 @@ Description: Create shared and static library
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -26,11 +26,14 @@
+@@ -26,11 +26,14 @@ set(SOURCES
  )
  
  add_library(xdf ${SOURCES})
@@ -19,7 +19,7 @@ Description: Create shared and static library
  else()
  	message(STATUS "Using bundled pugixml")
  	target_sources(xdf PRIVATE pugixml/pugixml.cpp)
-@@ -39,6 +42,7 @@
+@@ -39,6 +42,7 @@ endif()
  
  target_compile_features(xdf PUBLIC cxx_std_11)
  set_target_properties(xdf PROPERTIES OUTPUT_NAME xdf PUBLIC_HEADER xdf.h)
@@ -27,7 +27,7 @@ Description: Create shared and static library
  target_include_directories(xdf PUBLIC
  	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
  	$<INSTALL_INTERFACE:include>
-@@ -50,6 +54,12 @@
+@@ -50,6 +54,12 @@ install(TARGETS xdf
  	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
  )


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
 version=4
 
 opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz" \
-  https://github.com/Yida-Lin/libxdf/releases/latest .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@
+  https://github.com/Yida-Lin/libxdf/releases/latest .*/v?@ANY_VERSION@@ARCHIVE_EXT@


=====================================
xdf.pro
=====================================
@@ -32,5 +32,5 @@ unix {
 }
 
 macx {
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
 }



View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/4d2d5c64dc91b449f69e72545ba10eb8753691cf...dd20895419be34c6add92ffaa80e85553086254c

-- 
View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/4d2d5c64dc91b449f69e72545ba10eb8753691cf...dd20895419be34c6add92ffaa80e85553086254c
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/20211001/863c4046/attachment-0001.htm>

More information about the debian-med-commit mailing list