Control: tag -1 + patch On Sun, 23 Jul 2017 16:21:42 +0200, Mattia Rizzolo wrote:
> Source: ifeffit > Version: 2:1.2.11d-10.1 > Severity: serious > User: [email protected] > Usertag: perl-5.26-transition > Control: block 866389 by -1 I doubt that a package in contrib should be a blocker for the perl transition ... > I tried to rebuild ifeffit for the perl 5.26 transition, but it fails: > > fakeroot debian/rules clean > dh_testdir > dh_testroot > rm -f build-stamp build-ifeffit build-all-pythons build-python* build-perl > build-docs > [ ! -f Makefile ] || /usr/bin/make distclean > rm -f wrappers/perl/Makefile.PL > rm -f wrappers/perl/Makefile > rm -f wrappers/perl/pm_to_blib > rm -f wrappers/python/site_install.py > rm -f wrappers/tcl/TclSetup.in > rm -f readline/config.log > rm -f readline/config.status > rm -f readline/stamp-h > rm -f readline/config.h > rm -f readline/Makefile > rm -f readline/doc/Makefile > rm -f readline/shlib/Makefile > rm -f readline/examples/Makefile > rm -f configure.in.save > rm -rf tmp_docs > cd doc/Tutorial && make clean && rm -f *.bak > make[1]: Entering directory '/build/ifeffit-1.2.11d/doc/Tutorial' > ../scripts/latexmk -C tutor.tex > Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in > m/\\blackandwhite{ <-- HERE ([^\001\040\011}]*)}/ at ../scripts/latexmk line > 1160. > Makefile:98: recipe for target 'clean' failed > make[1]: *** [clean] Error 2 > make[1]: Leaving directory '/build/ifeffit-1.2.11d/doc/Tutorial' > debian/rules:136: recipe for target 'clean' failed > make: *** [clean] Error 2 > dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit status 2 Debdiff attached which adds a patch to esacpe a bunch of literal curlies. Cheers, gregor -- .''`. https://info.comodo.priv.at/ - Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Rolling Stones: Shake-roll
diff -Nru ifeffit-1.2.11d/debian/changelog ifeffit-1.2.11d/debian/changelog --- ifeffit-1.2.11d/debian/changelog 2016-11-06 12:37:37.000000000 +0100 +++ ifeffit-1.2.11d/debian/changelog 2017-07-23 17:03:12.000000000 +0200 @@ -1,3 +1,12 @@ +ifeffit (2:1.2.11d-10.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with perl 5.26": add unescaped-left-brace.patch to escape + literal opening curly braces. + (Closes: #869436) + + -- gregor herrmann <[email protected]> Sun, 23 Jul 2017 17:03:12 +0200 + ifeffit (2:1.2.11d-10.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru ifeffit-1.2.11d/debian/patches/series ifeffit-1.2.11d/debian/patches/series --- ifeffit-1.2.11d/debian/patches/series 2015-01-11 01:27:49.000000000 +0100 +++ ifeffit-1.2.11d/debian/patches/series 2017-07-23 17:03:12.000000000 +0200 @@ -3,3 +3,4 @@ wrapper_patches documentation_patches readline_6.3_patch +unescaped-left-brace.patch diff -Nru ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch --- ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch 1970-01-01 01:00:00.000000000 +0100 +++ ifeffit-1.2.11d/debian/patches/unescaped-left-brace.patch 2017-07-23 17:03:12.000000000 +0200 @@ -0,0 +1,78 @@ +Description: Fix 'Unescaped left brace' error +Origin: vendor +Bug-Debian: https://bugs.debian.org/869436 +Forwarded: no +Author: gregor herrmann <[email protected]> +Last-Update: 2017-07-23 + +--- a/doc/scripts/latexmk ++++ b/doc/scripts/latexmk +@@ -1157,7 +1157,7 @@ + } + } + } +- elsif (/\\blackandwhite{([^\001\040\011}]*)}/ || /\\colorslides{([^\001}]*)}/) ++ elsif (/\\blackandwhite\{([^\001\040\011}]*)}/ || /\\colorslides\{([^\001}]*)}/) + { + $slide_mode = 1; + $full_filename = $1; +@@ -1179,7 +1179,7 @@ + } + } + } +- elsif (/\\psfig{file=([^,}]+)/ || /\\psfig{figure=([^,}]+)/) ++ elsif (/\\psfig\{file=([^,}]+)/ || /\\psfig\{figure=([^,}]+)/) + { + $full_filename = &find_file($1,$psfigsearchpath); + if ($full_filename) +@@ -1191,9 +1191,9 @@ + } + } + } +- elsif ( /\\epsfbox{([^}]+)}/ || /\\epsfbox\[[^\]]*\]{([^}]+)}/ || +- /\\epsffile{([^}]+)}/ || /\\epsffile\[[^\]]*\]{([^}]+)}/ || +- /\\epsfig{file=([^,}]+)/ || /\\epsfig{figure=([^,}]+)/ ) ++ elsif ( /\\epsfbox\{([^}]+)}/ || /\\epsfbox\[[^\]]*\]\{([^}]+)}/ || ++ /\\epsffile\{([^}]+)}/ || /\\epsffile\[[^\]]*\]\{([^}]+)}/ || ++ /\\epsfig\{file=([^,}]+)/ || /\\epsfig\{figure=([^,}]+)/ ) + { + $full_filename = &find_file($1,$TEXINPUTS); + if ($full_filename) +@@ -1210,7 +1210,7 @@ + warn " Detected landscape mode\n"; + $landscape_mode = 1; + } +- elsif (/\\bibliography{([^}]+)}/) ++ elsif (/\\bibliography\{([^}]+)}/) + { + $bib_files = $1; + $bib_files =~ tr/,/ /; +@@ -1218,7 +1218,7 @@ + warn " Found bibliography files [$bib_files]\n"; + $bibtex_mode = 1; + } +- elsif (/\\psfigsearchpath{([^}]+)}/) ++ elsif (/\\psfigsearchpath\{([^}]+)}/) + { + $psfigsearchpath = $1; + } +--- a/doc/scripts/FixPDFout ++++ b/doc/scripts/FixPDFout +@@ -11,7 +11,7 @@ + s/\\_/_/go; + s/\\137/_/go; + $line = $_; +- if (/\\BOOKMARK \[(.*)\]{(.*)}{(.*)}{(.*)}/ ) { ++ if (/\\BOOKMARK \[(.*)\]\{(.*)}\{(.*)}\{(.*)}/ ) { + $n = $1; $x1 = $2; $x2 = $3; $x3 = $4; + $x2 =~ s/\{//go; + $x2 =~ s/\}//go; +@@ -22,7 +22,7 @@ + $x2 =~ s/ \(k\) / chi(k) /go; + $x2 =~ s/PD1OT1ptmptmmmnn//go; + $x2 =~ s/\\(\w*) //go; +- $line = " \\BOOKMARK [$n]{$x1}{$x2}{$x3}"; ++ $line = " \\BOOKMARK [$n]\{$x1}\{$x2}\{$x3}"; + } + print OUT "$line\n"; + }
signature.asc
Description: Digital Signature
