[Pkg-octave-commit] [octave] 01/01: Apply the upstream solution regarding the manpage for octave-cli

Sat Jan 4 14:32:29 UTC 2014

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

rlaboiss-guest pushed a commit to branch master
in repository octave.

commit 4a701956a4dd9f23cc4704a09de53cef8cacfbb2
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Jan 4 15:21:31 2014 +0100

    Apply the upstream solution regarding the manpage for octave-cli
    
    The octave-cli-manpage.diff patch has been changed according to the
    upstream Hg changeset
    http://hg.savannah.gnu.org/hgweb/octave/raw-rev/8d7e45ea11fa
    
    A proper manpage octave-cli.1 is now created (added to octave.manpages)
    and the links file octave.links is removed.
    
    Git-Dch: Ignore
---
 debian/octave.links                    |   1 -
 debian/octave.manpages                 |   1 +
 debian/patches/octave-cli-manpage.diff | 122 +++++++++++++++++++++++++++------
 3 files changed, 102 insertions(+), 22 deletions(-)

diff --git a/debian/octave.links b/debian/octave.links
deleted file mode 100644
index bdc8a84..0000000
--- a/debian/octave.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man1/octave.1.gz usr/share/man/man1/octave-cli.1.gz
diff --git a/debian/octave.manpages b/debian/octave.manpages
index 42549cd..ca76538 100644
--- a/debian/octave.manpages
+++ b/debian/octave.manpages
@@ -1 +1,2 @@
 doc/interpreter/octave.1
+doc/interpreter/octave-cli.1
diff --git a/debian/patches/octave-cli-manpage.diff b/debian/patches/octave-cli-manpage.diff
index 0e19d1c..dbe031f 100644
--- a/debian/patches/octave-cli-manpage.diff
+++ b/debian/patches/octave-cli-manpage.diff
@@ -1,25 +1,105 @@
-Description: Mention the octave-cli command in the manpage for octave
+Description: Add manpage for octave-cli
 Author: Rafael Laboissiere <rafael at laboissiere.net>
 Forwarded: https://savannah.gnu.org/bugs/index.php?41085
-Last-Update: 2014-01-02
+Origin: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/8d7e45ea11fa
+Last-Update: 2014-01-04
 
---- octave-3.8.0~rc2.orig/doc/interpreter/octave.1
-+++ octave-3.8.0~rc2/doc/interpreter/octave.1
-@@ -30,10 +30,16 @@
- octave \- A high-level interactive language for numerical computations.
- .SH SYNOPSIS
- \fBoctave\fP [\fIoptions\fP]... [\fIfile\fP]
-+.br
+--- a/doc/interpreter/Makefile.am
++++ b/doc/interpreter/Makefile.am
+@@ -32,6 +32,7 @@
+ 
+ dist_man_MANS = \
+   mkoctfile.1 \
++  octave-cli.1 \
+   octave-config.1 \
+   octave.1
+ 
+--- /dev/null
++++ b/doc/interpreter/octave-cli.1
+@@ -0,0 +1,86 @@
++.\" Copyright (C) 1996-2014 John W. Eaton
++.\"
++.\" This file is part of Octave.
++.\"
++.\" Octave is free software; you can redistribute it and/or modify it
++.\" under the terms of the GNU General Public License as published by the
++.\" Free Software Foundation; either version 3 of the License, or (at
++.\" your option) any later version.
++.\"
++.\" Octave is distributed in the hope that it will be useful, but WITHOUT
++.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++.\" for more details.
++.\"
++.\" You should have received a copy of the GNU General Public License
++.\" along with Octave; see the file COPYING.  If not, see
++.\" <http://www.gnu.org/licenses/>.
++.\" --------------------------------------------------------------------
++.de Vb \" (V)erbatim (b)egin.  Use fixed width font and no justification
++.ft CW
++.nf
++..
++.de Ve \" (V)erbatim (e)nd.  Return to regular font and justification
++.ft R
++.fi
++..
++.\" --------------------------------------------------------------------
++.TH OCTAVE-CLI 1 "03 January 2014" "GNU Octave"
++.SH NAME
++octave-cli \- A high-level interactive language for numerical computations.
++.SH SYNOPSIS
 +\fBoctave-cli\fP [\fIoptions\fP]... [\fIfile\fP]
- .SH DESCRIPTION
- Octave is a high-level language, primarily intended for numerical
- computations.  It provides a convenient command line interface for
--solving linear and nonlinear problems numerically.
-+solving linear and nonlinear problems numerically.  It also provides
-+a graphical user interface that can be launched with the command
-+\fBoctave --force-gui\fP.  The \fBoctave-cli\fP command is a synonym
-+for the \fBoctave\fP command, except for the fact that option
-+\fI--force-gui\fP will not work with it.
- .SH OPTIONS
- The complete set of command-line options for \fBoctave\fP is available by
- running the following command from the shell.
++.SH DESCRIPTION
++Octave is a high-level language, primarily intended for numerical
++computations.  It provides a convenient command line interface for
++solving linear and nonlinear problems numerically.  \fBoctave-cli\fP
++has been compiled without any GUI support (Qt) which makes it smaller
++than the default \fBoctave\fP executable, but also limits it to
++providing just the command line interface (CLI).
++.SH OPTIONS
++The complete set of command-line options for \fBoctave-cli\fP is available
++by running the following command from the shell.
++.Vb
++
++    octave-cli \-\-help
++.Ve
++.SH DOCUMENTATION
++The primary documentation for Octave is written using Texinfo, the GNU
++documentation system, which allows the same source files to be used to
++produce online and printed versions of the manual.
++.PP
++You can read the online copy of the Octave documentation by issuing
++the following command from within Octave.
++.Vb
++
++    octave:1> doc
++
++.Ve
++The Info files may also be read with a stand-alone program such as
++\fBinfo\fP or \fBxinfo\fP.  HTML, Postscript, or PDF versions of the
++documentation are installed on many systems as well.
++.SH BUGS
++The Octave project maintains a bug tracker at http://bugs.octave.org.
++Before submitting a new item please read the instructions at
++http://www.octave.org/bugs.html on how to submit a useful report.
++.SH FILES
++Upon startup Octave looks for four initialization files.  Each file
++may contain any number of valid Octave commands.
++.TP
++\fIoctave-home\fP/share/octave/site/m/startup/octaverc
++Site-wide initialization file which changes options for all users.
++\fIoctave-home\fP is the directory where Octave was installed such as
++\fB/usr/local\fP.
++.TP
++\fIoctave-home\fP/share/octave/\fIversion\fP/m/startup/octaverc
++Site-wide initialization file for Octave version \fIversion\fP.
++.TP
++~/.octaverc
++User's personal initialization file.
++.TP
++\&\.octaverc
++Project-specific initialization file located in the current directory.
++.SH AUTHOR
++John W. Eaton <jwe at octave.org>
++.SH SEE ALSO
++octave (1)

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

