Control: tags 869869 + pending

Dear maintainer,

I've prepared an NMU for kalzium (versioned as 4:17.08.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru kalzium-17.08.0/debian/changelog kalzium-17.08.0/debian/changelog
--- kalzium-17.08.0/debian/changelog	2017-09-18 15:06:16.000000000 +0200
+++ kalzium-17.08.0/debian/changelog	2017-10-22 16:29:30.000000000 +0200
@@ -1,3 +1,12 @@
+kalzium (4:17.08.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "kalzium FTBFS with OCaml 4.05.0: Options -c and -o are
+    incompatible when compiling C files" by applying patch from
+    Stéphane Glondu, via the BTS (Closes: #869869)
+
+ -- Tobias Frost <t...@debian.org>  Sun, 22 Oct 2017 16:29:30 +0200
+
 kalzium (4:17.08.0-1) experimental; urgency=medium
 
   * New upstream release (17.08.0)
diff -Nru kalzium-17.08.0/debian/patches/869869.patch kalzium-17.08.0/debian/patches/869869.patch
--- kalzium-17.08.0/debian/patches/869869.patch	1970-01-01 01:00:00.000000000 +0100
+++ kalzium-17.08.0/debian/patches/869869.patch	2017-10-22 16:29:30.000000000 +0200
@@ -0,0 +1,17 @@
+Description: Fix compilation with OCaml 4.05.0
+Author: Stéphane Glondu <glo...@debian.org>
+Bug-Debian: https://bugs.debian.org/869869
+Forwarded: no
+Last-Update: 2017-07-28
+
+--- a/src/CMakeOCamlInstructions.cmake
++++ b/src/CMakeOCamlInstructions.cmake
+@@ -58,7 +58,7 @@
+ # object files
+ 
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+-                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c
++                   COMMAND ${OCAML_OCAMLOPT_EXECUTABLE} -I ${LIBFACILE_INCLUDE_DIR} -c ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c -ccopt -o -ccopt ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o
+                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/solver/modwrap.c ${CMAKE_CURRENT_BINARY_DIR}/solver.o
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/modwrap.o)
diff -Nru kalzium-17.08.0/debian/patches/series kalzium-17.08.0/debian/patches/series
--- kalzium-17.08.0/debian/patches/series	2017-09-18 15:06:16.000000000 +0200
+++ kalzium-17.08.0/debian/patches/series	2017-10-22 16:29:30.000000000 +0200
@@ -1,3 +1,4 @@
 no_install_rpath_use_link_path.diff
 avoid_nameclash.patch
 add_missing_include.patch
+869869.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to