Bug#1052698: bookworm-pu: package flann/1.9.2+dfsg-1

[Jochen Sprickerhof]

Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: flann at packages.debian.org
Control: affects -1 + src:flann

[ Reason ]
The flann.pc pkg-config contains a stray semicolon in Libs.

[ Impact ]
It is hard to use on the command line, as reported in #1052649.

[ Tests ]
pkg-config --libs flann

[ Risks ]
None.

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
Drop @LZ4_STATIC_LDFLAGS@ from Libs: as lz4 is already listed in
Requires: and thus pkg-config will add a -llz4 automatically.
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 2a56dc0..0abc5f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+flann (1.9.2+dfsg-1+deb12u1) bookworm; urgency=medium
+
+  * Drop extra -llz4 from flann.pc (already in Requires:) (Closes: #1052649)
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Tue, 26 Sep 2023 12:15:32 +0200
+
 flann (1.9.2+dfsg-1) unstable; urgency=medium
 
   * New upstream version 1.9.2+dfsg
diff --git a/debian/patches/0005-Fix-lz4-missing-from-flann.pc-Requires-line.patch b/debian/patches/0005-Fix-lz4-missing-from-flann.pc-Requires-line.patch
index 3359424..cbb3bcf 100644
--- a/debian/patches/0005-Fix-lz4-missing-from-flann.pc-Requires-line.patch
+++ b/debian/patches/0005-Fix-lz4-missing-from-flann.pc-Requires-line.patch
@@ -14,7 +14,8 @@ are not made available.
 ---
  CMakeLists.txt       | 5 +++++
  cmake/CMakeLists.txt | 9 +++++++++
- 2 files changed, 14 insertions(+)
+ cmake/flann.pc.in    | 2 +-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 06963fb..15f09dc 100644
@@ -64,3 +65,15 @@ index fb70f4c..be6c1dc 100644
  set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/flann.pc)
  configure_file(flann.pc.in ${pkg_conf_file} @ONLY)
  install(FILES ${pkg_conf_file}
+diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in
+index 07b8d64..82eee5e 100644
+--- a/cmake/flann.pc.in
++++ b/cmake/flann.pc.in
+@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@
+ Description: @PKG_DESC@
+ Version: @FLANN_VERSION@
+ Requires: @PKG_EXTERNAL_DEPS@
+-Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp
++Libs: -L${libdir} -lflann -lflann_cpp
+ Cflags: -I${includedir}
+