Control: tags 789731 + patch Control: tags 789731 + pending Control: tags 789732 + patch Control: tags 789732 + pending
Dear maintainer, I've prepared an NMU for latex2html (versioned as 2008-debian1-10.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Eric Clapton: After Midnight
diff -Nru latex2html-2008-debian1/debian/changelog latex2html-2008-debian1/debian/changelog --- latex2html-2008-debian1/debian/changelog 2013-06-25 21:36:59.000000000 +0200 +++ latex2html-2008-debian1/debian/changelog 2015-09-13 15:33:21.000000000 +0200 @@ -1,3 +1,17 @@ +latex2html (2008-debian1-10.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with perl 5.22: Can't use 'defined(@array)'": + add patch perl5.22-defined-array.patch: + drop defined(). + (Closes: #789731) + * Fix "regexp deprecation warnings with perl 5.22": + add patch perl5.22-unescaped-left-braces.patch: + escape literal braces. + (Closes: #789732) + + -- gregor herrmann <[email protected]> Sun, 13 Sep 2015 15:32:38 +0200 + latex2html (2008-debian1-10) unstable; urgency=low * Use DEP5 for debian/copyright, adjust license for L2hos/ (Closes: #713855) diff -Nru latex2html-2008-debian1/debian/patches/perl5.22-defined-array.patch latex2html-2008-debian1/debian/patches/perl5.22-defined-array.patch --- latex2html-2008-debian1/debian/patches/perl5.22-defined-array.patch 1970-01-01 01:00:00.000000000 +0100 +++ latex2html-2008-debian1/debian/patches/perl5.22-defined-array.patch 2015-09-13 15:32:20.000000000 +0200 @@ -0,0 +1,18 @@ +Description: defined(@array) is an error since perl 5.21.x +Origin: vendor +Bug-Debian: https://bugs.debian.org/789731 +Forwarded: no +Author: gregor herrmann <[email protected]> +Last-Update: 2015-09-13 + +--- a/versions/frame.pl ++++ b/versions/frame.pl +@@ -354,7 +354,7 @@ + elsif ($reverse == 1) {$colorset="${which}_colorset_star"} + elsif ($reverse == 2) {$colorset="${which}_colorset_star_star"} + else {$colorset="${which}_colorset"} +- if (!(defined @$colorset)) ++ if (!(@$colorset)) + { print STDERR "\nframes for $which are not supported\n"; return($rest);} + local($frame_tmp)=$frame_data; + local($key, @values); diff -Nru latex2html-2008-debian1/debian/patches/perl5.22-unescaped-left-braces.patch latex2html-2008-debian1/debian/patches/perl5.22-unescaped-left-braces.patch --- latex2html-2008-debian1/debian/patches/perl5.22-unescaped-left-braces.patch 1970-01-01 01:00:00.000000000 +0100 +++ latex2html-2008-debian1/debian/patches/perl5.22-unescaped-left-braces.patch 2015-09-13 15:31:36.000000000 +0200 @@ -0,0 +1,87 @@ +Description: escape literal braces in regexp to avoid deprecation warnings +Origin: vendor +Bug-Debian: https://bugs.debian.org/789732 +Forwarded: no +Author: gregor herrmann <[email protected]> +Last-Update: 2015-09-13 + +--- a/latex2html.pin ++++ b/latex2html.pin +@@ -1207,7 +1207,7 @@ + &slurp_input($file); + if ($ext =~ /bbl/) { + # remove the \newcommand{\etalchar}{...} since not needed +- s/^\\newcommand{\\etalchar}[^\n\r]*[\n\r]+//s; ++ s/^\\newcommand\{\\etalchar\}[^\n\r]*[\n\r]+//s; + } + &pre_process; + &substitute_meta_cmds if (%new_command || %new_environment); +@@ -1465,7 +1465,7 @@ + push(@processedV,$before); + print "'";$before = ''; + } +- if ($after =~ /\s*\\end{$env[*]?}/) { # Must NOT use the s///o option!!! ++ if ($after =~ /\s*\\end\{$env[*]?\}/) { # Must NOT use the s///o option!!! + ($contents, $after) = ($`, $'); + $contents =~ s/^\n+/\n/s; + # $contents =~ s/\n+$//s; +@@ -1898,8 +1898,8 @@ + # local (*_) = @_; # Modifies $_ in the caller; + # -> MRO: changed to $_[0] (same effect) + # MRO: removed deprecated $*, replaced by option /m +- $_[0] =~ s/(^|[^\\])\\{/$1tex2html_escaped_opening_bracket/gom; +- $_[0] =~ s/(^|[^\\])\\{/$1tex2html_escaped_opening_bracket/gom; # repeat this ++ $_[0] =~ s/(^|[^\\])\\\{/$1tex2html_escaped_opening_bracket/gom; ++ $_[0] =~ s/(^|[^\\])\\\{/$1tex2html_escaped_opening_bracket/gom; # repeat this + $_[0] =~ s/(^|[^\\])\\}/$1tex2html_escaped_closing_bracket/gom; + $_[0] =~ s/(^|[^\\])\\}/$1tex2html_escaped_closing_bracket/gom; # repeat this + my $id = $global{'max_id'}; +@@ -2780,7 +2780,7 @@ + $open_tags_R = [ @save_open_tags ]; + # check for color + local($color_test) = join(',',@$open_tags_R); +- if ($color_test =~ /(color{[^}]*})/g ) { ++ if ($color_test =~ /(color\{[^}]*\})/g ) { + $color_env = $1; + } # else { $color_env = '' } + +@@ -2791,7 +2791,7 @@ + $open_tags_R = [ @save_open_tags ]; + if ($color_env) { + $color_test = join(',',@saved_tags); +- if ($color_test =~ /(color{[^}]*})/g ) { ++ if ($color_test =~ /(color\{[^}]*\})/g ) { + $color_env = $1; + } + } +@@ -6507,7 +6507,7 @@ + print "\nATTRIBS: $saved\n" if ($VERBOSITY > 6); + + $saved =~ s/$percent_mark/%/g; +- $saved =~ s/((^|[\s,=])')\\\W{(\w)}/$1$3/g ++ $saved =~ s/((^|[\s,=])')\\\W\{(\w)\}/$1$3/g + if $is_german; #unwanted accents, from active " + if (@tags) { + foreach $tag (@tags) { +--- a/versions/frame.pl ++++ b/versions/frame.pl +@@ -774,7 +774,7 @@ + $_[0] =~ s/<(META NAME|LINK)[^>]*>\s*//g; + $_[0] =~ s/$more_links_mark/$NO_ROBOTS\n$LATEX2HTML_META/g; + local($savedRS)=$/; $/ = ''; +- $_[0] =~ s/\n{2;}/\n/sg; ++ $_[0] =~ s/\n{2,}/\n/sg; + $_[0] =~ s/\s$//s; + $_[0] =~ s!\s*(\n</HEAD>\n)\s*!$1!s; + $/ = $savedRS; +--- a/versions/html4_0.pl ++++ b/versions/html4_0.pl +@@ -955,7 +955,7 @@ + + if ($color_env) { + local($color_test) = join(',',@$open_tags_R); +- if ($color_test =~ /(color{[^}]*})/g ) { ++ if ($color_test =~ /(color\{[^}]*\})/g ) { + $color_env = $1; + } + } diff -Nru latex2html-2008-debian1/debian/patches/series latex2html-2008-debian1/debian/patches/series --- latex2html-2008-debian1/debian/patches/series 2012-04-09 17:20:10.000000000 +0200 +++ latex2html-2008-debian1/debian/patches/series 2015-09-13 15:17:23.000000000 +0200 @@ -23,3 +23,5 @@ eurosym.patch match-multiline.patch latex2html-fix-defined.patch +perl5.22-defined-array.patch +perl5.22-unescaped-left-braces.patch
signature.asc
Description: Digital Signature
