diff -Nru pdf2djvu-0.9.17/debian/changelog pdf2djvu-0.9.17/debian/changelog --- pdf2djvu-0.9.17/debian/changelog 2020-03-04 03:14:07.000000000 +0000 +++ pdf2djvu-0.9.17/debian/changelog 2020-09-08 11:04:22.000000000 +0000 @@ -1,3 +1,10 @@ +pdf2djvu (0.9.17-1+rpi1) bullseye-staging; urgency=medium + + * Apply upstream patches to fix poppler version parsing and + hence fix FTBFS with new poppler. + + -- Peter Michael Green Tue, 08 Sep 2020 11:04:22 +0000 + pdf2djvu (0.9.17-1) unstable; urgency=medium * New upstream release. diff -Nru pdf2djvu-0.9.17/debian/patches/catch-poppler-version-parsing-errors.patch pdf2djvu-0.9.17/debian/patches/catch-poppler-version-parsing-errors.patch --- pdf2djvu-0.9.17/debian/patches/catch-poppler-version-parsing-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.17/debian/patches/catch-poppler-version-parsing-errors.patch 2020-09-08 11:04:22.000000000 +0000 @@ -0,0 +1,23 @@ +commit fbb1d294e7ea5727e52ba96e4df60ba557b192e1 +Author: Jakub Wilk +Date: Mon Aug 3 10:05:31 2020 +0200 + + configure: catch Poppler version parsing errors. + +diff --git a/configure.ac b/configure.ac +index 9f7bc46..e37bbf5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,7 +76,11 @@ AC_MSG_RESULT([ok]) + PKG_CHECK_MODULES([POPPLER], [poppler-splash >= 0.35.0]) + poppler_version=$($PKG_CONFIG --modversion poppler-splash) + AC_DEFINE_UNQUOTED([POPPLER_VERSION_STRING], ["$poppler_version"], [Define to the version of Poppler]) +-poppler_version=$(IFS=.; set -- $poppler_version; printf '%d' $(( ((100 * $1) + $2) * 100 + $3 )) ) ++AS_IF( ++ [poppler_version=$(IFS=.; set -- $poppler_version; printf '%d' $(( ((100 * $1) + $2) * 100 + $3 )) )], ++ [:], ++ [AC_MSG_ERROR([could not parse Poppler version])] ++) + AC_DEFINE_UNQUOTED([POPPLER_VERSION], [$poppler_version], [Define to the version of Poppler, as integer]) + AC_MSG_CHECKING([for Poppler xpdf headers]) + original_cppflags="$CPPFLAGS" diff -Nru pdf2djvu-0.9.17/debian/patches/fix-poppler-version-parsing.patch pdf2djvu-0.9.17/debian/patches/fix-poppler-version-parsing.patch --- pdf2djvu-0.9.17/debian/patches/fix-poppler-version-parsing.patch 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.17/debian/patches/fix-poppler-version-parsing.patch 2020-09-08 11:04:22.000000000 +0000 @@ -0,0 +1,41 @@ +commit 7056706cc72796634ebe75a1fb1b5a82c26faa49 +Author: Jakub Wilk +Date: Mon Aug 3 10:05:31 2020 +0200 + + configure: fix Poppler version parsing. + + Fixes: + + ./configure: line 4073: ((100 * 20) + 08: value too great for base (error token is "08") + configure: error: could not parse Poppler version + + with Poppler 20.08. + +diff --git a/configure.ac b/configure.ac +index e37bbf5..93afbe8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,8 +76,22 @@ AC_MSG_RESULT([ok]) + PKG_CHECK_MODULES([POPPLER], [poppler-splash >= 0.35.0]) + poppler_version=$($PKG_CONFIG --modversion poppler-splash) + AC_DEFINE_UNQUOTED([POPPLER_VERSION_STRING], ["$poppler_version"], [Define to the version of Poppler]) ++parse_poppler_version() ++{ ++ test $# -eq 3 || return 1 ++ printf '%s' "${1#0}" ++ shift ++ for v in "$@" ++ do ++ case $v in ++ ?) printf '0%s' "$v";; ++ ??) printf '%s' "$v";; ++ *) return 1; ++ esac ++ done ++} + AS_IF( +- [poppler_version=$(IFS=.; set -- $poppler_version; printf '%d' $(( ((100 * $1) + $2) * 100 + $3 )) )], ++ [poppler_version=$(IFS=.; parse_poppler_version $poppler_version)], + [:], + [AC_MSG_ERROR([could not parse Poppler version])] + ) diff -Nru pdf2djvu-0.9.17/debian/patches/series pdf2djvu-0.9.17/debian/patches/series --- pdf2djvu-0.9.17/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pdf2djvu-0.9.17/debian/patches/series 2020-09-08 11:04:22.000000000 +0000 @@ -0,0 +1,2 @@ +catch-poppler-version-parsing-errors.patch +fix-poppler-version-parsing.patch