uncommitted - coinor-vol

Ready changes

Summary

Import uploads missing from VCS:

Diff

diff --git a/BuildTools/coin.m4 b/BuildTools/coin.m4
index d7e3afd..0c82ec8 100644
--- a/BuildTools/coin.m4
+++ b/BuildTools/coin.m4
@@ -1595,9 +1595,6 @@ if test "x$LIBTOOL" = x; then
   fi
 fi
 
-# Donot use the generated libtool, instead rely on AC_COIN_PROG_LIBTOOL
-LIBTOOL=
-
 if test "x$LIBTOOL" = x; then
 # AC_MSG_NOTICE([Creating libtool script (calling COIN_PROG_LIBTOOL).])
   # Stuff for libtool
diff --git a/Data/Sample/Makefile.am b/Data/Sample/Makefile.am
index 20fc672..69b02c1 100644
--- a/Data/Sample/Makefile.am
+++ b/Data/Sample/Makefile.am
@@ -22,7 +22,7 @@ datacoin_DATA = $(EXAMPLE_FILES)
 pkgconfiglibdir = $(libdir)/pkgconfig
 pkgconfiglib_DATA = coindatasample.pc
 
-include ../../BuildTools/Makemain.inc
+include BuildTools/Makemain.inc
 
 test:
 	@echo "No test available."
diff --git a/Osi/Makefile.am b/Osi/Makefile.am
index 3fefa56..569811c 100644
--- a/Osi/Makefile.am
+++ b/Osi/Makefile.am
@@ -126,4 +126,4 @@ CLEANFILES =
 # Files that are generated and should be cleaned with make distclean
 DISTCLEANFILES =
 
-include ../BuildTools/Makemain.inc
+include BuildTools/Makemain.inc
diff --git a/Vol/Makefile.am b/Vol/Makefile.am
index 9c27300..9fe0965 100644
--- a/Vol/Makefile.am
+++ b/Vol/Makefile.am
@@ -119,4 +119,4 @@ uninstall-local: uninstall-doc
 # Files that are generated and should be cleaned with make distclean
 DISTCLEANFILES =
 
-include ../BuildTools/Makemain.inc
+include BuildTools/Makemain.inc
diff --git a/debian/changelog b/debian/changelog
index ad68884..61dff8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+coinor-vol (1.5.4-4) unstable; urgency=medium
+
+  * QA upload.
+  * Mark a template symbol as optional.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Mar 2020 22:13:49 +0100
+
 coinor-vol (1.5.4-3) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/coinor-libvol1.symbols b/debian/coinor-libvol1.symbols
index 66592e1..92c57f4 100644
--- a/debian/coinor-libvol1.symbols
+++ b/debian/coinor-libvol1.symbols
@@ -27,4 +27,4 @@ libVol.so.1 coinor-libvol1 #MINVER#
  _ZNK11VOL_problem10power_heurERK10VOL_primalS2_RK8VOL_dual@Base 1.5.4
  _ZNK11VOL_problem15readjust_targetEdd@Base 1.5.4
  _ZNK8VOL_dual6ascentERK11VOL_dvectorS2_@Base 1.5.4
- _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 1.5.4
+ (optional)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 1.5.4
diff --git a/debian/control b/debian/control
index 390466d..77121c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper-compat (= 12), doxygen, graphviz
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://projects.coin-or.org/Vol
 Vcs-Git: https://salsa.debian.org/debian/coinor-vol.git

Run locally

More details

Full run details