Merge updates from debian/bookworm

Makefile.in

@@ -90,7 +90,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx_17.m4 \
 	$(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -194,7 +195,8 @@ DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/libixion.pc.in $(top_srcdir)/bin/env.sh.in \
 	$(top_srcdir)/misc/libixion.spec.in AUTHORS ChangeLog README \
-	compile config.guess config.sub install-sh ltmain.sh missing
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -281,7 +283,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
-HAVE_CXX11 = @HAVE_CXX11@
+HAVE_CXX17 = @HAVE_CXX17@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -339,6 +341,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VULKAN_CFLAGS = @VULKAN_CFLAGS@
+VULKAN_LIBS = @VULKAN_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

aclocal.m4

@@ -1647,7 +1647,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([m4/ax_cxx_compile_stdcxx.m4])
+m4_include([m4/ax_cxx_compile_stdcxx_17.m4])
 m4_include([m4/boost.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])

config.h.in

@@ -12,8 +12,8 @@
 /* Define to 1 if you have <boost/system/error_code.hpp> */
 #undef HAVE_BOOST_SYSTEM_ERROR_CODE_HPP
 
-/* define if the compiler supports basic C++11 syntax */
-#undef HAVE_CXX11
+/* define if the compiler supports basic C++17 syntax */
+#undef HAVE_CXX17
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H

configure.ac

@@ -2,11 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 m4_define([ixion_major_version], [0])
-m4_define([ixion_minor_version], [16])
-m4_define([ixion_micro_version], [1])
+m4_define([ixion_minor_version], [17])
+m4_define([ixion_micro_version], [0])
 
 m4_define([ixion_major_api_version], [0])
-m4_define([ixion_minor_api_version], [16])
+m4_define([ixion_minor_api_version], [17])
 
 m4_define([ixion_version],
           [ixion_major_version.ixion_minor_version.ixion_micro_version])
@@ -20,7 +20,7 @@ AC_INIT([libixion], [ixion_version])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AX_CXX_COMPILE_STDCXX_11
+AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
 CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Wall -Wshadow -Wno-write-strings -pthread"
 
 AC_CANONICAL_HOST
@@ -57,10 +57,10 @@ AC_ARG_ENABLE([threads],
     [enable_threads=yes]
 )
 
-AC_ARG_ENABLE([cuda],
-    [AS_HELP_STRING([--enable-cuda], [Enable CUDA compute engine])],
-    [enable_cuda="$enableval"],
-    [enable_cuda=no]
+AC_ARG_ENABLE([vulkan],
+    [AS_HELP_STRING([--enable-vulkan], [Enable vulkan compute engine])],
+    [enable_vulkan="$enableval"],
+    [enable_vulkan=no]
 )
 
 IXION_VERSION=ixion_version
@@ -127,7 +127,7 @@ AS_IF([test "x$enable_debug" != "xno"], [
 	AC_DEFINE([NDEBUG], [], [Disable debugging information])
 ])
 
-PKG_CHECK_MODULES([MDDS],[mdds-1.5 >= 1.4.99])
+PKG_CHECK_MODULES([MDDS],[mdds-2.0 >= 1.9.99])
 
 AC_ARG_ENABLE(log-debug,
 	AS_HELP_STRING([--enable-log-debug], [Enable debug outputs.])],
@@ -162,12 +162,16 @@ AS_IF([test "x$enable_threads" != "xno"], [
 ])
 
 AS_IF([test "x$enable_debug_utils" != "xno"], [
-        CXXFLAGS="$CXXFLAGS -D__IXION_DEBUG_UTILS"
+        CXXFLAGS="$CXXFLAGS -DIXION_DEBUG_UTILS"
+])
+
+AS_IF([test "x$enable_vulkan" != "xno"], [
+        PKG_CHECK_MODULES([VULKAN],[vulkan >= 1.2.0])
 ])
 
 AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"])
 AM_CONDITIONAL([IXION_THREADS], [test "x$enable_threads" != "xno"])
-AM_CONDITIONAL([BUILD_CUDA], [test "x$enable_cuda" != "xno"])
+AM_CONDITIONAL([BUILD_VULKAN], [test "x$enable_vulkan" != "xno"])
 AM_CONDITIONAL([OSX], [test "x$_os" = "xDarwin"])
 
 BOOST_PROGRAM_OPTIONS
@@ -211,7 +215,7 @@ Build configuration:
         host os:              $host_os
         python:               $enable_python
         threads:              $enable_threads
-        cuda:                 $enable_cuda
+        vulkan:               $enable_vulkan
         log (debug)           $enable_log_debug
         log (trace)           $enable_log_trace
 ==============================================================================

debian/changelog

+libixion (0.17.0-3) unstable; urgency=medium
+
+  * upload to unstable 
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 08 Dec 2021 19:40:26 +0100
+
+libixion (0.17.0-2) experimental; urgency=medium
+
+  * update debian/not-installed for 0.17 
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 06 Nov 2021 13:23:34 +0100
+
+libixion (0.17.0-1) experimental; urgency=medium
+
+  * New upstream version 0.17.0
+
+  * update mdds build-dep; remove mdds dep (not exported anymore)
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 06 Nov 2021 07:08:15 +0100
+
+libixion (0.16.1-4) unstable; urgency=medium
+
+  * add Build-Depends: libmdds-dev (<< 2.0~) to prevent trying with mdds-2.0
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 02 Nov 2021 18:12:58 +0100
+
+libixion (0.16.1-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Mattia Rizzolo ]
+  * Enable threads on armel again, since the gcc bug should be long fixed.
+  * Move list of files to clean from d/rules to d/clean.
+  * Declaratively use python3 and sphinxdoc dh sequences from d/control
+    instead of d/rules.
+  * Install the docs from d/*.docs instead of d/*.install, and simplify
+    d/rules in the process.
+  * Use a arch-dependant override for the tests, instead of a manual `if`.
+  * Use the right overrides for the right targets for a more intuitive flow.
+  * Drop Build-Dep on dh-autoreconf, implied by debhelper>=10.
+  * Bump Standards-Version to 4.6.0, set Rules-Requires-Root:no.
+  * Use HTTPS in d/watch.
+  * Bump debhelper compat level to 13.
+
+  [ Debian Janitor ]
+  * Remove constraints unnecessary since buster:
+    + Build-Depends: Drop versioned constraint on dpkg-dev.
+
+ -- Mattia Rizzolo <mattia@debian.org>  Fri, 24 Sep 2021 12:54:13 +0200
+
 libixion (0.16.1-2apertis0) apertis; urgency=medium
 
   * Sync from Debian debian/bullseye.

debian/clean

+doc/_doxygen doc/tmp
+src/ixion-test
+src/libixion/ixion-test

debian/control

 Source: libixion
+Section: libs
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
 Uploaders:
  Rene Engelhard <rene@debian.org>,
 Build-Depends:
- debhelper-compat (= 12),
- dh-autoreconf,
- dh-python,
- dpkg-dev (>= 1.16.1),
+ debhelper-compat (= 13),
+Build-Depends-Arch:
+ dh-sequence-python3,
  libboost-filesystem-dev,
  libboost-program-options-dev,
  libboost-system-dev,
  libboost-thread-dev,
- libmdds-dev (>= 1.5),
+ libmdds-dev (>= 2.0),
+ libmdds-dev (<< 2.1~),
  pkg-config,
  python3,
  python3-dev,
- sphinx-common,
  zlib1g-dev,
 Build-Depends-Indep:
+ dh-sequence-sphinxdoc,
  doxygen,
  python3-breathe,
  python3-sphinx,
- python3-sphinx-rtd-theme
+ python3-sphinx-rtd-theme,
 Build-Conflicts:
  python-sphinx,
-Standards-Version: 3.9.3
-Section: libs
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
 Homepage: https://gitlab.com/ixion/ixion
 Vcs-Browser: https://salsa.debian.org/libreoffice-team/libixion
 Vcs-Git: https://salsa.debian.org/libreoffice-team/libixion.git
@@ -36,8 +37,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libixion-0.16-0 (= ${binary:Version}),
- libmdds-dev (>= 1.5),
+ libixion-0.17-0 (= ${binary:Version}),
  ${misc:Depends},
 Description: general purpose formula parser & interpreter library -- development
  Ixion is a general purpose formula parser & interpreter that can calculate
@@ -46,7 +46,7 @@ Description: general purpose formula parser & interpreter library -- development
  This package contains headers, pkg-config file and static library for
  developing applications using Ixion.
 
-Package: libixion-0.16-0
+Package: libixion-0.17-0
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -66,7 +66,7 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
-Description: general purpose formula parser & interpreter library -- python module
+Description: general purpose formula parser & interpreter library -- Python module
  Ixion is a general purpose formula parser & interpreter that can calculate
  multiple named targets, or “cells”.
  .
@@ -78,7 +78,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
- ${sphinxdoc:Depends}
+ ${sphinxdoc:Depends},
 Description: general purpose formula parser & interpreter library -- documentation
  Ixion is a general purpose formula parser & interpreter that can calculate
  multiple named targets, or “cells”.

debian/libixion-0.16-0.install

-usr/lib/*/libixion*-0.16.so.*

debian/libixion-0.17-0.install

+usr/lib/*/libixion*-0.17.so.*

debian/libixion-dev.dirs

-usr/include
-usr/lib

debian/libixion-doc.docs

+doc/tmp/*

debian/libixion-doc.install

-../../doc/tmp/* usr/share/doc/libixion-doc

debian/not-installed

+usr/bin/ixion-formula-tokenizer
+usr/bin/ixion-parser
+usr/bin/ixion-sorter
+usr/lib/python*/site-packages/ixion.a
+usr/lib/python*/site-packages/ixion.la
+usr/lib/*/libixion-0.17.la

debian/rules

 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,43 +6,31 @@
 include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@  --with python3 --with sphinxdoc
+	dh $@
 
-# afffected by https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727621
-ifeq (armel,$(findstring armel,$(DEB_HOST_ARCH)))
-CONFIGURE_FLAGS_EXTRA += --disable-threads
-endif
+override_dh_autoreconf-indep:
+override_dh_auto_configure-indep:
+	@# nothing
 
-override_dh_auto_build-arch:
-	dh_autoreconf
-	dh_auto_configure -- --disable-silent-rules --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-static $(CONFIGURE_FLAGS_EXTRA)
-	dh_auto_build
+override_dh_auto_configure-arch:
+	dh_auto_configure -- --disable-silent-rules --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --enable-static
 
 override_dh_auto_build-indep:
 	cd doc && \
 		doxygen doxygen.conf && \
 		mkdir tmp && sphinx-build -v -a . tmp
 
-override_dh_auto_clean:
-	dh_auto_clean
-	dh_autoreconf_clean
-	rm -f src/ixion-test
-	rm -f src/libixion/ixion-test
-	rm -rf doc/_doxygen doc/tmp
+override_dh_auto_test-arch:
+	PYTHONPATH="$(CURDIR)/src/python/.libs" dh_auto_test
 
-override_dh_auto_configure:
-
-override_dh_auto_test:
-	if [ -d $(CURDIR)/src/python/.libs ]; then \
-		PYTHONPATH="$(CURDIR)/src/python/.libs" dh_auto_test; \
-	fi
-
-override_dh_auto_install:
-	# otherwise dh_auto_install -plibixion-doc doesn't work because there's
-	# no debian/tmp it can cd from
-	mkdir -p debian/tmp
-	if [ -d src/.libs ]; then dh_auto_install; else dh_auto_install -- -plibixion-doc; fi
+override_dh_missing:
+	rm -f debian/tmp/usr/lib/x86_64-linux-gnu/libixion-0.17.la
+	dh_missing
 
 override_dh_makeshlibs:
 	dh_makeshlibs -VNone
 
+override_dh_installdocs:
+	# Ignore Policy v3.9.7 §12.3 for now
+	dh_installdocs -plibixion-doc --doc-main-package=libixion-doc
+	dh_installdocs --remaining-packages

debian/tests/control

 Test-Command: set -e ; cd "$AUTOPKGTEST_TMP" ; python3 -c "import ixion; print(ixion)"
-Depends: python3, python3-ixion
+Depends:
+ python3,
+ python3-ixion,
 
 Tests: unit
-Depends: @builddeps@, libixion-0.16-0, python3-ixion
+Depends:
+ libixion-0.17-0,
+ python3-ixion,
+ @builddeps@,
 Restrictions: build-needed, rw-build-tree
-

debian/watch

 version=4
 opts=downloadurlmangle=s|gitlab.com/ixion/ixion/repository/(@ANY_VERSION@)/archive.tar.gz|kohei.us/files/ixion/src/@PACKAGE@-$1.tar.xz|,repack,compression=xz \
-http://gitlab.com/ixion/ixion/tags .*/@ANY_VERSION@/archive\.tar\.gz
+https://gitlab.com/ixion/ixion/tags .*/@ANY_VERSION@/archive\.tar\.gz

doc/conf.py

@@ -20,7 +20,7 @@ import subprocess
 rtd_build = os.environ.get('READTHEDOCS', None) == 'True'
 
 if rtd_build:
-    subprocess.call("cd doc; doxygen doxygen.conf", shell=True)
+    subprocess.call("doxygen --version; doxygen doxygen.conf", shell=True)
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -51,7 +51,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Ixion'
-copyright = '2018, Kohei Yoshida'
+copyright = '2021, Kohei Yoshida'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

doc/cpp/data_store/cell_access.rst

@@ -44,9 +44,8 @@ print the value of the cell as follows::
         }
         case ixion::cell_value_t::string:
         {
-            const std::string* s = ca.get_string_value();
-            if (s)
-                cout << "string value: " << *s << endl;
+            std::string_view s = ca.get_string_value();
+            cout << "string value: " << s << endl;
             break;
         }
         case ixion::cell_value_t::boolean: