diff --git a/debian/changelog b/debian/changelog index 429a403..0bfe570 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ * do not call mktexlsr without arguments in texinfo.postrm (Closes: #717901) * allow for cross compiling, patch thanks to Eleanor Chen (Closes: #719907) - - -- Norbert Preining Mon, 19 Aug 2013 21:52:41 +0900 + * fix building with perl 5.18 (from upstream svn) (Closes: #720866) + + -- Norbert Preining Thu, 05 Sep 2013 10:04:36 +0900 texinfo (5.1.dfsg.1-4) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index b9e3aa6..0501b00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ info_universal_argument dont_build_info maybe-upstream-fix-itemize-start +upstream-perl5.18 diff --git a/debian/patches/upstream-perl5.18 b/debian/patches/upstream-perl5.18 new file mode 100644 index 0000000..f828454 --- /dev/null +++ b/debian/patches/upstream-perl5.18 @@ -0,0 +1,427 @@ +svn5298 and svn5308 from upstream to fix perl5.18 building +--- + tp/Texinfo/Convert/HTML.pm | 2 + tp/init/chm.pm | 2 + tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2 | 2 + tp/tests/layout/res_parser/formatting_chm/formatting.hhk | 352 +++++----- + tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 | 2 + tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 | 2 + 6 files changed, 181 insertions(+), 181 deletions(-) + +--- texinfo.orig/tp/Texinfo/Convert/HTML.pm ++++ texinfo/tp/Texinfo/Convert/HTML.pm +@@ -7069,7 +7069,7 @@ + $parser_for_renamed_nodes = $self->{'parser'}->parser(); + } + my %warned_new_node; +- foreach my $old_node_name (keys(%{$self->{'renamed_nodes'}})) { ++ foreach my $old_node_name (sort(keys(%{$self->{'renamed_nodes'}}))) { + my $parsed_old_node = $self->_parse_node_and_warn_external( + $old_node_name, $parser_for_renamed_nodes, + $self->{'renamed_nodes_lines'}->{$old_node_name}, +--- texinfo.orig/tp/init/chm.pm ++++ texinfo/tp/init/chm.pm +@@ -237,7 +237,7 @@ + $self->{'index_entries'}, + $self->{'index_names'}); + if ($index_entries) { +- foreach my $index_name (keys (%$index_entries)) { ++ foreach my $index_name (sort(keys(%$index_entries))) { + foreach my $index_entry_ref (@{$index_entries->{$index_name}}) { + my $file = $self->command_filename($index_entry_ref->{'command'}); + # happens for things in @titlepage when it is not output +--- texinfo.orig/tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2 ++++ texinfo/tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2 +@@ -1,2 +1,2 @@ + unknown_nodes_renamed.texi: warning: must specify a title with a title command or @top +-unknown_nodes_renamed-noderename.cnf:3: warning: target node (new name for `unknown node 2') not in document: renamed as unknow too ++unknown_nodes_renamed-noderename.cnf:3: warning: target node (new name for `Unknown node 1') not in document: renamed as unknow too +--- texinfo.orig/tp/tests/layout/res_parser/formatting_chm/formatting.hhk ++++ texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.hhk +@@ -9,182 +9,6 @@ + + +
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • +- +- +-
    • +-
  • + + +
    • +@@ -944,5 +768,181 @@ + + + ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • ++
  • ++ ++ ++
    • + + +--- texinfo.orig/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 ++++ texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 +@@ -7,7 +7,7 @@ + equivalent_nodes-noderename.cnf:8: warning: no node to be renamed + equivalent_nodes-noderename.cnf:10: warning: nodes without a new name at the end of file + equivalent_nodes.texi: warning: must specify a title with a title command or @top ++equivalent_nodes-noderename.cnf: file empty for renamed node `@strong{}' + equivalent_nodes-noderename.cnf: old name for `ToP' is a node of the document + equivalent_nodes-noderename.cnf: old name for `Top' is a node of the document +-equivalent_nodes-noderename.cnf: file empty for renamed node `@strong{}' + equivalent_nodes-noderename.cnf: warning: target node (new name for `old non existing') not in document: non existing file +--- texinfo.orig/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 ++++ texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2 +@@ -7,7 +7,7 @@ + equivalent_nodes-noderename.cnf:8: warning: no node to be renamed + equivalent_nodes-noderename.cnf:10: warning: nodes without a new name at the end of file + equivalent_nodes.texi: warning: must specify a title with a title command or @top ++equivalent_nodes-noderename.cnf: file empty for renamed node `@strong{}' + equivalent_nodes-noderename.cnf: old name for `ToP' is a node of the document + equivalent_nodes-noderename.cnf: old name for `Top' is a node of the document +-equivalent_nodes-noderename.cnf: file empty for renamed node `@strong{}' + equivalent_nodes-noderename.cnf: warning: target node (new name for `old non existing') not in document: non existing file