Control: tags 1110625 + patch
Control: tags 1110625 + pending
Control: tags 1130687 + patch
Control: tags 1130687 + pending

Dear maintainer,

I've prepared an NMU for libkolabxml (versioned as 1.2.1-5.2) and 
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.

cu
Adrian
diffstat for libkolabxml-1.2.1 libkolabxml-1.2.1

 changelog               |    8 ++++++++
 control                 |    4 ++--
 libkolabxml1v5.symbols  |    5 -----
 patches/boost1.89.patch |   15 +++++++++++++++
 patches/series          |    1 +
 5 files changed, 26 insertions(+), 7 deletions(-)

diff -Nru libkolabxml-1.2.1/debian/changelog libkolabxml-1.2.1/debian/changelog
--- libkolabxml-1.2.1/debian/changelog	2025-11-14 22:22:05.000000000 +0200
+++ libkolabxml-1.2.1/debian/changelog	2026-03-20 14:39:08.000000000 +0200
@@ -1,3 +1,11 @@
+libkolabxml (1.2.1-5.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Boost 1.90. (Closes: #1110625)
+  * Correct Vcs links. (Closes: #1130687)
+
+ -- Adrian Bunk <[email protected]>  Fri, 20 Mar 2026 14:39:08 +0200
+
 libkolabxml (1.2.1-5.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libkolabxml-1.2.1/debian/control libkolabxml-1.2.1/debian/control
--- libkolabxml-1.2.1/debian/control	2023-12-12 12:49:45.000000000 +0200
+++ libkolabxml-1.2.1/debian/control	2026-03-20 14:39:08.000000000 +0200
@@ -23,8 +23,8 @@
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://git.kolab.org/diffusion/LKX/
-Vcs-Git: https://salsa.debian.org/debian//libkolabxml.git
-Vcs-Browser: https://salsa.debian.org/debian//libkolabxml
+Vcs-Git: https://salsa.debian.org/debian/libkolabxml.git
+Vcs-Browser: https://salsa.debian.org/debian/libkolabxml
 
 Package: libkolabxml-dev
 Section: libdevel
diff -Nru libkolabxml-1.2.1/debian/libkolabxml1v5.symbols libkolabxml-1.2.1/debian/libkolabxml1v5.symbols
--- libkolabxml-1.2.1/debian/libkolabxml1v5.symbols	2023-12-12 12:49:45.000000000 +0200
+++ libkolabxml-1.2.1/debian/libkolabxml1v5.symbols	2026-03-20 14:38:06.000000000 +0200
@@ -5631,7 +5631,6 @@
  _ZTIN3xsd3cxx4tree9time_zoneE@Base 1.1.0
  _ZTIN3xsd3cxx9exceptionE@Base 1.1.0
  (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTIN5boost10wrapexceptINS_16bad_lexical_castEEE@Base 1.1.6
- (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTIN5boost10wrapexceptINS_5uuids13entropy_errorEEE@Base 1.1.6
  _ZTIN5boost16bad_lexical_castE@Base 1.1.0
  _ZTIN5boost16exception_detail10bad_alloc_E@Base 1.1.0
  _ZTIN5boost16exception_detail10clone_baseE@Base 1.1.0
@@ -5644,7 +5643,6 @@
  (optional|arch=kfreebsd-amd64 kfreebsd-i386 mips powerpcspe)_ZTIN5boost16exception_detail19error_info_injectorISt13runtime_errorEE@Base 1.1.0
  (optional|arch=kfreebsd-amd64 kfreebsd-i386 mips powerpcspe)_ZTIN5boost16exception_detail19error_info_injectorISt16invalid_argumentEE@Base 1.1.0
  _ZTIN5boost16exception_detail20error_info_containerE@Base 1.1.0
- (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTIN5boost5uuids13entropy_errorE@Base 1.1.6
  _ZTIN5boost6detail15sp_counted_baseE@Base 1.1.0
  _ZTIN5boost6detail16basic_pointerbufIcSt15basic_streambufIcSt11char_traitsIcEEEE@Base 1.1.0
  (subst|optional|arch=kfreebsd-amd64 kfreebsd-i386 mips powerpcspe)_ZTIN5boost6detail17sp_counted_impl_pINS_6random23mersenne_twister_engineIjL{size_t}32EL{size_t}624EL{size_t}397EL{size_t}31ELj2567483615EL{size_t}11ELj4294967295EL{size_t}7ELj2636928640EL{size_t}15ELj4022730752EL{size_t}18ELj1812433253EEEEE@Base 1.1.0
@@ -5944,7 +5942,6 @@
  _ZTSN3xsd3cxx9exceptionE@Base 1.1.0
  (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTSN5boost10error_infoINS_27tag_original_exception_typeEPKSt9type_infoEE@Base 1.1.6
  (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTSN5boost10wrapexceptINS_16bad_lexical_castEEE@Base 1.1.6
- (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTSN5boost10wrapexceptINS_5uuids13entropy_errorEEE@Base 1.1.6
  _ZTSN5boost16bad_lexical_castE@Base 1.1.0
  _ZTSN5boost16exception_detail10bad_alloc_E@Base 1.1.0
  _ZTSN5boost16exception_detail10clone_baseE@Base 1.1.0
@@ -5958,10 +5955,8 @@
  (optional|arch=kfreebsd-amd64 kfreebsd-i386 mips powerpcspe)_ZTSN5boost16exception_detail19error_info_injectorISt16invalid_argumentEE@Base 1.1.0
  _ZTSN5boost16exception_detail20error_info_containerE@Base 1.1.0
  _ZTSN5boost16exception_detail25error_info_container_implE@Base 1.1.0
- (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !powerpcspe)_ZTSN5boost5uuids13entropy_errorE@Base 1.1.6
  _ZTSN5boost6detail15sp_counted_baseE@Base 1.1.0
  _ZTSN5boost6detail16basic_pointerbufIcSt15basic_streambufIcSt11char_traitsIcEEEE@Base 1.1.0
- _ZTSN5boost6detail17basic_unlockedbufISt15basic_streambufIcSt11char_traitsIcEEcEE@Base 1.1.0
  _ZTSN5boost6detail17sp_counted_impl_pIN5Kolab13ConfigurationEEE@Base 1.1.0
  _ZTSN5boost6detail17sp_counted_impl_pIN5Kolab4FileEEE@Base 1.1.0
  _ZTSN5boost6detail17sp_counted_impl_pIN5Kolab4NoteEEE@Base 1.1.0
diff -Nru libkolabxml-1.2.1/debian/patches/boost1.89.patch libkolabxml-1.2.1/debian/patches/boost1.89.patch
--- libkolabxml-1.2.1/debian/patches/boost1.89.patch	1970-01-01 02:00:00.000000000 +0200
+++ libkolabxml-1.2.1/debian/patches/boost1.89.patch	2026-03-20 14:39:06.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with Boost >= 1.89
+Author: Adrian Bunk <[email protected]>
+Bug-Debian: https://bugs.debian.org/1110625
+
+--- libkolabxml-1.2.1.orig/CMakeLists.txt
++++ libkolabxml-1.2.1/CMakeLists.txt
+@@ -92,7 +92,7 @@ endforeach()
+ configure_file(libkolabxml-version.h.cmake "${CMAKE_BINARY_DIR}/libkolabxml-version.h" @ONLY)
+ 
+ set(Boost_USE_MULTITHREADED ON)
+-find_package(Boost REQUIRED COMPONENTS thread system)
++find_package(Boost REQUIRED COMPONENTS thread)
+ if (Boost_FOUND)
+     message("Found boost in ${Boost_INCLUDE_DIRS}")
+ endif (Boost_FOUND)
diff -Nru libkolabxml-1.2.1/debian/patches/series libkolabxml-1.2.1/debian/patches/series
--- libkolabxml-1.2.1/debian/patches/series	2025-11-14 22:22:05.000000000 +0200
+++ libkolabxml-1.2.1/debian/patches/series	2026-03-20 14:38:30.000000000 +0200
@@ -2,3 +2,4 @@
 fix-parallel-build.patch
 use-phpconfig-to-detect-phpincludedir.patch
 cmake-4.patch
+boost1.89.patch

Reply via email to