diff -pruN 4.2.0-1/debian/changelog 4.2.0-2/debian/changelog --- 4.2.0-1/debian/changelog 2021-12-15 19:31:05.000000000 +0000 +++ 4.2.0-2/debian/changelog 2022-08-04 20:04:02.000000000 +0000 @@ -1,3 +1,18 @@ +givaro (4.2.0-2) unstable; urgency=medium + + * debian/control + - Bump Standards-Version to 4.6.1. + * debian/copyright + - Bump my copyright years. + * debian/rules + - Remove symlinks before building docs to avoid regression in doxygen + 1.9.4 (Closes: #1016261). + * debian/salsa-ci.yml + - Stop allowing reprotest to fail; no longer an issue with doxygen + 1.9.4. + + -- Doug Torrance Thu, 04 Aug 2022 16:04:02 -0400 + givaro (4.2.0-1) unstable; urgency=medium * New upstream release. diff -pruN 4.2.0-1/debian/control 4.2.0-2/debian/control --- 4.2.0-1/debian/control 2021-12-04 11:15:27.000000000 +0000 +++ 4.2.0-2/debian/control 2022-08-04 12:07:44.000000000 +0000 @@ -7,7 +7,7 @@ Uploaders: Julien Puydt = 4:7), libgmp-dev Build-Depends-Indep: doxygen, doxygen-latex, graphviz, jdupes, texlive-science -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/math-team/givaro.git Vcs-Browser: https://salsa.debian.org/math-team/givaro Rules-Requires-Root: no diff -pruN 4.2.0-1/debian/copyright 4.2.0-2/debian/copyright --- 4.2.0-1/debian/copyright 2021-12-04 11:15:27.000000000 +0000 +++ 4.2.0-2/debian/copyright 2022-08-04 12:08:20.000000000 +0000 @@ -488,7 +488,7 @@ License: GPL-2 Files: debian/* Copyright: 2008 Tim Abbott 2012 Lifeng Sun - 2016-2021 Doug Torrance + 2016-2022 Doug Torrance 2019 Julien Puydt License: GPL-2.0+ diff -pruN 4.2.0-1/debian/rules 4.2.0-2/debian/rules --- 4.2.0-1/debian/rules 2021-12-09 10:30:08.000000000 +0000 +++ 4.2.0-2/debian/rules 2022-08-04 18:50:11.000000000 +0000 @@ -2,10 +2,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ENABLE_DOC := $(if $(shell dh_listpackages -i),--enable-doc) - override_dh_auto_configure: - dh_auto_configure -- $(ENABLE_DOC) --without-archnative + dh_auto_configure -- --without-archnative # the default value of USE_TARGETS is "docs", but this builds the # documentation a second time @@ -26,6 +24,15 @@ override_dh_auto_test: override_dh_makeshlibs: dh_makeshlibs -V'libgivaro9 (>= 4.0.2-8~)' +# hacky fix for #1016261 -- remove symlinks before building docs to +# avoid regression in doxygen 1.9.4 +execute_before_dh_installdocs-indep: + find . -type l '(' -name givaro -o -name recint -o -name gmp++ ')' \ + -exec rm {} + + sed 's/^HAVE_DOT.*/HAVE_DOT = YES/' docs/Doxyfile.mod > docs/Doxyfile + $(MAKE) -C docs docs + $(MAKE) -C docs install-doc DESTDIR=../debian/tmp + HTML_DIR = debian/libgivaro-doc/usr/share/doc/libgivaro-dev/givaro-html execute_after_dh_installdocs-indep: diff -pruN 4.2.0-1/debian/salsa-ci.yml 4.2.0-2/debian/salsa-ci.yml --- 4.2.0-1/debian/salsa-ci.yml 2021-12-05 05:02:21.000000000 +0000 +++ 4.2.0-2/debian/salsa-ci.yml 2022-08-04 19:59:22.000000000 +0000 @@ -2,6 +2,3 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - -reprotest: - allow_failure: true