diff -Nru doxygen-1.8.11/debian/changelog doxygen-1.8.11/debian/changelog --- doxygen-1.8.11/debian/changelog 2019-05-30 08:55:06.000000000 -0700 +++ doxygen-1.8.11/debian/changelog 2019-06-24 12:22:46.000000000 -0700 @@ -1,3 +1,15 @@ +doxygen (1.8.11-1ubuntu0.2) xenial; urgency=medium + + * Backport fix bug:regression, unescaped precent, pound, dollar sign in + doxygen latex output to a FTBFS for cimg ( LP: #1833627) + * upstream source: + - https://github.com/doxygen/doxygen/commit/d59ed22f114398d74d5c3fd1445a7901d26ff93a + - https://github.com/doxygen/doxygen/commit/d4ab02c2da7df472bebbf2724419ba00f2de229c + - https://github.com/doxygen/doxygen/commit/537a1c67f316c5a9d2d4542e94a4ace439a78b3a + + + -- Daniel Wang Thu, 20 Jun 2019 15:31:01 -0700 + doxygen (1.8.11-1ubuntu0.1) xenial-security; urgency=medium * SECURITY UPDATE: Cross-site scripting/iframe injection diff -Nru doxygen-1.8.11/debian/patches/fix-regression-unescaped-sign.patch doxygen-1.8.11/debian/patches/fix-regression-unescaped-sign.patch --- doxygen-1.8.11/debian/patches/fix-regression-unescaped-sign.patch 1969-12-31 16:00:00.000000000 -0800 +++ doxygen-1.8.11/debian/patches/fix-regression-unescaped-sign.patch 2019-06-24 10:54:36.000000000 -0700 @@ -0,0 +1,43 @@ +Backport of: https://github.com/doxygen/doxygen/commit/537a1c67f316c5a9d2d4542e94a4ace439a78b3a +From: albert-github +Date: Sat, 5 Mar 2016 20:35:16 +0100 +Date: Sat, 5 Mar 2016 19:42:45 +0100 +Subject: [PATCH] Bug 763104 - hyperref link label drop underscores + +Backport of: https://github.com/doxygen/doxygen/commit/d59ed22f114398d74d5c3fd1445a7901d26ff93a +From: albert-github +Date: Sun, 28 May 2017 13:14:50 +0200 +Subject: [PATCH] Bug 783134 - LaTeX output for \tparam block fails to compile + when it contains a \code block + +Backport of: https://github.com/doxygen/doxygen/commit/d59ed22f114398d74d5c3fd1445a7901d26ff93a (partially) +From: albert-github +Date: Sun, 28 May 2017 13:14:50 +0200 +Subject: [PATCH] Bug 783134 - LaTeX output for \tparam block fails to compile + when it contains a \code block + +Index: doxygen-1.8.11/src/util.cpp +=================================================================== +--- doxygen-1.8.11.orig/src/util.cpp ++++ doxygen-1.8.11/src/util.cpp +@@ -6550,6 +6550,10 @@ void filterLatexString(FTextStream &t,co + case '{': t << "\\{"; break; + case '}': t << "\\}"; break; + case '_': t << "\\_"; break; ++ case '&': t << "\\&"; break; ++ case '%': t << "\\%"; break; ++ case '#': t << "\\#"; break; ++ case '$': t << "\\$"; break; + case ' ': if (keepSpaces) t << "~"; else t << ' '; + break; + default: +@@ -6730,6 +6734,9 @@ QCString latexEscapePDFString(const char + case '\\': t << "\\textbackslash{}"; break; + case '{': t << "\\{"; break; + case '}': t << "\\}"; break; ++ case '_': t << "\\_"; break; ++ case '%': t << "\\%"; break; ++ case '&': t << "\\&"; break; + default: + t << c; + break; diff -Nru doxygen-1.8.11/debian/patches/series doxygen-1.8.11/debian/patches/series --- doxygen-1.8.11/debian/patches/series 2019-05-30 08:52:55.000000000 -0700 +++ doxygen-1.8.11/debian/patches/series 2019-06-20 14:56:41.000000000 -0700 @@ -10,3 +10,4 @@ issue759241.diff pyversion.diff CVE-2016-10245.patch +fix-regression-unescaped-sign.patch