[med-svn] [Git][med-team/libxdf][master] 4 commits: Fix watch file

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / libxdf


Commits:
5bda7499 by Andreas Tille at 2022-11-24T12:08:09+01:00
Fix watch file

- - - - -
8bd82aa7 by Andreas Tille at 2022-11-24T12:08:28+01:00
routine-update: Standards-Version: 4.6.1

- - - - -
0dc2f993 by Andreas Tille at 2022-11-24T12:11:27+01:00
Revert unintended changes in upstream source

- - - - -
422e4708 by Andreas Tille at 2022-11-24T12:12:28+01:00
Upload to unstable

- - - - -


4 changed files:

- CMakeLists.txt
- debian/changelog
- debian/control
- debian/watch


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -26,14 +26,11 @@ 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)
@@ -42,7 +39,6 @@ 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>
@@ -54,12 +50,6 @@ 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::"


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libxdf (0.99.8+dfsg-2) unstable; urgency=medium
+
+  * Fix watch file
+  * Standards-Version: 4.6.1 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Thu, 24 Nov 2022 12:11:52 +0100
+
 libxdf (0.99.8+dfsg-1) unstable; urgency=medium
 
   * Fix watchfile to detect new versions on github


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13),
                cmake,
                d-shlibs,
                libpugixml-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 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/watch
=====================================
@@ -1,4 +1,4 @@
 version=4
 
-opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz" \
-  https://github.com/Yida-Lin/libxdf/releases/latest .*/v?@ANY_VERSION@@ARCHIVE_EXT@
+opts="repacksuffix=+dfsg,dversionmangle=auto,uversionmangle=s/0\.991/0.99.1/,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+  https://github.com/Yida-Lin/libxdf/tags .*/v?@ANY_VERSION@@ARCHIVE_EXT@



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/dd20895419be34c6add92ffaa80e85553086254c...422e47081dad0b02ed2116e6040162e5eaf53df3
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/20221124/bfbf654d/attachment-0001.htm>