[SCM] kalzium packaging branch, master, updated. debian/4%17.08.0-1-10-g3a4f92c

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalzium.git;a=commitdiff;h=1d5cc43

The following commit has been merged in the master branch:
commit 1d5cc43b23532de4af0c35fc6c79078826ab655a
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 2 09:46:49 2017 +0100

    import NMU 4:17.08.0-1.1
---
 debian/changelog            |  9 +++++++++
 debian/patches/869869.patch | 17 +++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95af8cc..0b54883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kalzium (4:17.08.0-1.1) experimental; 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 <tobi at debian.org>  Sun, 22 Oct 2017 16:47:55 +0200
+
 kalzium (4:17.08.0-1) experimental; urgency=medium
 
   * New upstream release (17.08.0)
diff --git a/debian/patches/869869.patch b/debian/patches/869869.patch
new file mode 100644
index 0000000..682449f
--- /dev/null
+++ b/debian/patches/869869.patch
@@ -0,0 +1,17 @@
+Description: Fix compilation with OCaml 4.05.0
+Author: Stéphane Glondu <glondu at 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 --git a/debian/patches/series b/debian/patches/series
index bbdf7cf..012293a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no_install_rpath_use_link_path.diff
 avoid_nameclash.patch
 add_missing_include.patch
+869869.patch

-- 
kalzium packaging