[Pkg-octave-commit] [octave] 04/09: Remove patches applied upstream:

Sébastien Villemot sebastien at debian.org
Sun Mar 9 21:18:30 UTC 2014 

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

sebastien pushed a commit to branch master
in repository octave.

commit fb349102582c4e7dbd914e02d671d962950762a9
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Mar 9 18:14:07 2014 +0100

    Remove patches applied upstream:
    
     + doc-compressed-info.diff
     + kfreebsd_tcgetattr.diff
     + octave-cli-manpage.diff
     + save-uint8-in-text-format.diff
    
    Git-Dch: Full
---
 debian/patches/doc-compressed-info.diff       |  18 -----
 debian/patches/kfreebsd_tcgetattr.diff        |  57 --------------
 debian/patches/octave-cli-manpage.diff        | 105 --------------------------
 debian/patches/save-uint8-in-text-format.diff |  60 ---------------
 debian/patches/series                         |   4 -
 5 files changed, 244 deletions(-)

diff --git a/debian/patches/doc-compressed-info.diff b/debian/patches/doc-compressed-info.diff
deleted file mode 100644
index d075b0c..0000000
--- a/debian/patches/doc-compressed-info.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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/kfreebsd_tcgetattr.diff b/debian/patches/kfreebsd_tcgetattr.diff
deleted file mode 100644
index cd9763d..0000000
--- a/debian/patches/kfreebsd_tcgetattr.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Detect and use appropriate terminal attribute functions
- Based on kfreebsd_support.diff in the kde4libs Debian package.
-Author: Mike Miller <mtmiller at debian.org>
-Applied-Upstream: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/d033b08e9b0e
-Bug: https://savannah.gnu.org/bugs/?41212
-Last-Updated: 2014-01-12
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -2162,7 +2162,7 @@ AC_CHECK_FUNCS([lgamma lgammaf lgamma_r
- AC_CHECK_FUNCS([log1p log1pf pipe])
- AC_CHECK_FUNCS([realpath resolvepath roundl])
- AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal])
--AC_CHECK_FUNCS([tempnam tgammaf toascii])
-+AC_CHECK_FUNCS([tcgetattr tcsetattr tempnam tgammaf toascii])
- AC_CHECK_FUNCS([umask waitpid])
- AC_CHECK_FUNCS([_kbhit])
- 
---- a/libgui/qterminal/libqterminal/unix/kpty.cpp
-+++ b/libgui/qterminal/libqterminal/unix/kpty.cpp
-@@ -116,24 +116,24 @@ extern "C" {
- # define _NEW_TTY_CTRL
- #endif
- 
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
-+#if defined(HAVE_TCGETATTR)
-+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-+#elif defined(TIOCGETA)
- # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
-+#elif defined(TCGETS)
-+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
- #else
--# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
--#  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
--# else
--#  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
--# endif
-+# error No method available to get terminal attributes
- #endif
- 
--#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
-+#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
-+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-+#elif defined(TIOCSETA)
- # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
-+#elif defined(TCSETS)
-+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
- #else
--# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
--#  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
--# else
--#  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
--# endif
-+# error No method available to set terminal attributes
- #endif
- 
- #include <QtCore>
diff --git a/debian/patches/octave-cli-manpage.diff b/debian/patches/octave-cli-manpage.diff
deleted file mode 100644
index dbe031f..0000000
--- a/debian/patches/octave-cli-manpage.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: Add manpage for octave-cli
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: https://savannah.gnu.org/bugs/index.php?41085
-Origin: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/8d7e45ea11fa
-Last-Update: 2014-01-04
-
---- 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.  \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)
diff --git a/debian/patches/save-uint8-in-text-format.diff b/debian/patches/save-uint8-in-text-format.diff
deleted file mode 100644
index 9b7be28..0000000
--- a/debian/patches/save-uint8-in-text-format.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fix saving int8 and uint8 in plain text format
-Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/raw-rev/284e5c87f27b
-Bug: http://savannah.gnu.org/bugs/?40980
-Bug-Debian: http://bugs.debian.org/732659
-Reviewed-By: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2014-01-11
-
---- octave-3.8.0.orig/liboctave/util/oct-inttypes.h
-+++ octave-3.8.0/liboctave/util/oct-inttypes.h
-@@ -1023,6 +1023,50 @@ operator >> (std::istream& is, octave_in
-   return is;
- }
- 
-+// We need to specialise for char and unsigned char because
-+// std::operator<< and std::operator>> are overloaded to input and
-+// output the ASCII character values instead of a representation of
-+// their numerical value (e.g. os << char(10) outputs a space instead
-+// of outputting the characters '1' and '0')
-+
-+template <>
-+inline std::ostream&
-+operator << (std::ostream& os, const octave_int<int8_t>& ival)
-+{
-+  os << static_cast<int> (ival.value ());
-+  return os;
-+}
-+
-+template <>
-+inline std::ostream&
-+operator << (std::ostream& os, const octave_int<uint8_t>& ival)
-+{
-+  os << static_cast<unsigned int> (ival.value ());
-+  return os;
-+}
-+
-+
-+template <>
-+inline std::istream&
-+operator >> (std::istream& is, octave_int<int8_t>& ival)
-+{
-+  int tmp = 0;
-+  is >> tmp;
-+  ival = static_cast<int8_t> (tmp);
-+  return is;
-+}
-+
-+template <>
-+inline std::istream&
-+operator >> (std::istream& is, octave_int<uint8_t>& ival)
-+{
-+  unsigned int tmp = 0;
-+  is >> tmp;
-+  ival = static_cast<uint8_t> (tmp);
-+  return is;
-+}
-+
-+
- // Bitwise operations
- 
- #define OCTAVE_INT_BITCMP_OP(OP) \
diff --git a/debian/patches/series b/debian/patches/series
index 1c56ac6..1dc08a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,10 +4,6 @@ install_libraries_publically
 no_pdf_in_print.diff
 add_info_dir_categories
 mkoctfile-mpi.diff
-octave-cli-manpage.diff
-doc-compressed-info.diff
 dblquad-s390x.diff
-kfreebsd_tcgetattr.diff
 hurd_path_max.diff
-save-uint8-in-text-format.diff
 always-build-octave-jar.patch

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

More information about the Pkg-octave-commit mailing list