[texinfo] 01/01: upstream cherry pick: info cannot follow cross-refs in some cases

[Norbert Preining <preining@debian.org>]

This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texinfo.

commit 81a78ffa67011fe47f59840dba726cefd9135f0b
Author: Norbert Preining <preining@debian.org>
Date:   Tue Jul 4 12:03:12 2017 +0900

    upstream cherry pick: info cannot follow cross-refs in some cases
---
 debian/changelog                       |  6 ++++++
 debian/patches/series                  |  1 +
 debian/patches/upstream-fix-info-links | 14 ++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6920db0..ef7b6d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texinfo (6.4.0.dfsg.1-2) unstable; urgency=medium
+
+  * upstream cherry pick: info cannot follow cross-refs in some cases
+
+ -- Norbert Preining <preining@debian.org>  Tue, 04 Jul 2017 12:02:11 +0900
+
 texinfo (6.4.0.dfsg.1-1) unstable; urgency=medium
 
   * adapt make-orig-tar for new release
diff --git a/debian/patches/series b/debian/patches/series
index 9f0a468..f4e55db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ numerical-signal-names
 dont_build_info
 info-manpage-mentiones-nonfree
 reproducible-makeinfo
+upstream-fix-info-links
diff --git a/debian/patches/upstream-fix-info-links b/debian/patches/upstream-fix-info-links
new file mode 100644
index 0000000..7134a76
--- /dev/null
+++ b/debian/patches/upstream-fix-info-links
@@ -0,0 +1,14 @@
+---
+ info/info-utils.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- texinfo.orig/info/info-utils.c
++++ texinfo/info/info-utils.c
+@@ -1280,6 +1280,7 @@
+                                 &entry->nodename);
+       if (!len)
+         return 0; /* Input invalid. */
++      canonicalize_whitespace (entry->nodename);
+       label_len += len;
+     }
+   else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git