[Pkg-octave-commit] [octave] 02/02: doc-compressed-info.diff: Add patch from upstream.

[Mike Miller]

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

mtmiller pushed a commit to branch master
in repository octave.

commit d6df3e0942ee8149deea09e302835df4dd713764
Author: Mike Miller <mtmiller at debian.org>
Date:   Sun Jan 5 20:07:16 2014 -0500

    doc-compressed-info.diff: Add patch from upstream.
    
    Fixes the doc command to work correctly with compressed info files.
    
    Git-Dch: Full
---
 debian/patches/doc-compressed-info.diff | 18 ++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/doc-compressed-info.diff b/debian/patches/doc-compressed-info.diff
new file mode 100644
index 0000000..d075b0c
--- /dev/null
+++ b/debian/patches/doc-compressed-info.diff
@@ -0,0 +1,18 @@
+Description: Check for existence of compressed info file
+Author: Mike Miller <mtmiller at ieee.org>
+Origin: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/ab775508dff9
+Bug: https://savannah.gnu.org/bugs/index.php?41054
+Last-Update: 2014-01-05
+
+--- a/scripts/help/doc.m
++++ b/scripts/help/doc.m
+@@ -80,7 +80,8 @@ function retval = doc (fname)
+       if (err < 0)
+         info_file_name = info_file ();
+ 
+-        if (! exist (info_file_name, "file"))
++        if (! exist (info_file_name, "file")
++            && ! exist ([info_file_name ".gz"], "file"))
+           __gripe_missing_component__ ("doc", "info-file");
+         endif
+       endif
diff --git a/debian/patches/series b/debian/patches/series
index eaabaa5..eea0381 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no_pdf_in_print.diff
 add_info_dir_categories
 mkoctfile-mpi.diff
 octave-cli-manpage.diff
+doc-compressed-info.diff

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git