diff -Nru enblend-enfuse-4.2/debian/changelog enblend-enfuse-4.2/debian/changelog --- enblend-enfuse-4.2/debian/changelog 2020-10-03 02:10:00.000000000 +0000 +++ enblend-enfuse-4.2/debian/changelog 2022-06-04 05:00:06.000000000 +0000 @@ -1,15 +1,32 @@ -enblend-enfuse (4.2-6build1~16.04.sav0) xenial; urgency=medium +enblend-enfuse (4.2-9~16.04.sav0) xenial; urgency=low * Backport to Xenial + * debian/rules: Restore unmentioned drop of dh_missing --fail-missing * debian/control: Set debhelper-compat (= 10) BD (LP highest for Xenial) - -- Rob Savoury Fri, 02 Oct 2020 19:10:00 -0700 + -- Rob Savoury Fri, 03 Jun 2022 22:00:06 -0700 -enblend-enfuse (4.2-6build1) focal; urgency=medium +enblend-enfuse (4.2-9) unstable; urgency=low - * No-change rebuild against libvigraimpex11. + * No change upload to force rebuild. - -- Rik Mills Sun, 05 Jan 2020 13:47:06 +0000 + -- Andreas Metzler Sun, 03 Apr 2022 14:08:47 +0200 + +enblend-enfuse (4.2-8) unstable; urgency=low + + * Upgrade watch file to version 4 standard. + * Add 45_ftbsf_microtype.diff (setting \usepackage[T1]{fontenc}) and a b-d + on cm-super to fix FTBFS. Closes: #980666 + + -- Andreas Metzler Sat, 23 Jan 2021 18:33:16 +0100 + +enblend-enfuse (4.2-7) unstable; urgency=low + + * Use dh v13 compat level. + * 40_fixftbfsboost.diff: Fix FTBFS against boost 1.74 (Thanks, Anton + Gladky!) Closes: #975081 + + -- Andreas Metzler Sat, 21 Nov 2020 07:27:03 +0100 enblend-enfuse (4.2-6) unstable; urgency=medium diff -Nru enblend-enfuse-4.2/debian/control enblend-enfuse-4.2/debian/control --- enblend-enfuse-4.2/debian/control 2020-10-03 02:10:00.000000000 +0000 +++ enblend-enfuse-4.2/debian/control 2022-06-04 04:50:06.000000000 +0000 @@ -6,6 +6,7 @@ Sebastian Harl , Andreas Metzler Build-Depends: + cm-super, debhelper-compat (= 10), gnuplot, graphviz, @@ -39,7 +40,8 @@ # texlive-extra-utils for texloganalyser # texlive-font-utils for repstopdf # texlive-fonts-extra for cmbcsc10 - #884230 -Standards-Version: 4.4.0 +# cm-super for fontenc - #980666: +Standards-Version: 4.5.1 Rules-Requires-Root: no Homepage: http://enblend.sourceforge.net/ Vcs-Git: https://salsa.debian.org/debian-phototools-team/enblend-enfuse.git diff -Nru enblend-enfuse-4.2/debian/patches/40_fixftbfsboost.diff enblend-enfuse-4.2/debian/patches/40_fixftbfsboost.diff --- enblend-enfuse-4.2/debian/patches/40_fixftbfsboost.diff 1970-01-01 00:00:00.000000000 +0000 +++ enblend-enfuse-4.2/debian/patches/40_fixftbfsboost.diff 2020-11-20 13:02:40.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Fix FTBFS against boost 1.74 +Origin: vendor +Author: Anton Gladky +Bug-Debian: https://bugs.debian.org/975081 +Forwarded: not-needed +Reviewed-By: Andreas Metzler +Last-Update: 2020-11-20 + +--- a/src/minimizer.cc ++++ b/src/minimizer.cc +@@ -18,6 +18,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include + #include + + #include "minimizer.h" diff -Nru enblend-enfuse-4.2/debian/patches/45_ftbsf_microtype.diff enblend-enfuse-4.2/debian/patches/45_ftbsf_microtype.diff --- enblend-enfuse-4.2/debian/patches/45_ftbsf_microtype.diff 1970-01-01 00:00:00.000000000 +0000 +++ enblend-enfuse-4.2/debian/patches/45_ftbsf_microtype.diff 2021-01-23 17:24:43.000000000 +0000 @@ -0,0 +1,21 @@ +Description: \usepackage[T1]{fontenc} to fix pdflatex error + ../../doc/enfuse-local-contrast-weighting.tex:260: pdfTeX error (font + expansion): auto expansion is only possible with scalable fonts. + ...shipout:D \box_use:N \l_shipout_box +Author: Andreas Metzler +Origin: vendor +Bug-Debian: https://bugs.debian.org/980666 +Forwarded: no +Last-Update: 2021-01-23 + + +--- enblend-enfuse-4.2.orig/doc/static-preamble.tex ++++ enblend-enfuse-4.2/doc/static-preamble.tex +@@ -17,6 +17,7 @@ + \usepackage{ifpdf} % \ifpdf + \usepackage{latexsym} % \Box + \usepackage{listings} ++\usepackage[T1]{fontenc} + \usepackage{microtype} % Improve spacing between words or letters + \usepackage{ragged2e} % Improve hyphenation after e.g. \raggedright + \usepackage{shorttoc} diff -Nru enblend-enfuse-4.2/debian/patches/series enblend-enfuse-4.2/debian/patches/series --- enblend-enfuse-4.2/debian/patches/series 2018-02-04 15:30:42.000000000 +0000 +++ enblend-enfuse-4.2/debian/patches/series 2021-01-23 17:26:32.000000000 +0000 @@ -1,2 +1,4 @@ 20_reproducible_sig.diff 30_hardcode_enfuse_example_dir.diff +40_fixftbfsboost.diff +45_ftbsf_microtype.diff diff -Nru enblend-enfuse-4.2/debian/watch enblend-enfuse-4.2/debian/watch --- enblend-enfuse-4.2/debian/watch 2018-02-04 15:30:42.000000000 +0000 +++ enblend-enfuse-4.2/debian/watch 2020-11-21 07:16:59.000000000 +0000 @@ -1,6 +1,6 @@ -version=3 +version=4 opts=dversionmangle=s/\+dfsg$// \ -http://sf.net/enblend/enblend(?:-enfuse)?-([0-9.]+)\.tar\.gz \ +http://sf.net/enblend/enblend(?:-enfuse)?-([0-9.]+)@ARCHIVE_EXT@ \ debian