[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit df3a0a2a314dcf32093dab54d7189e280ca85e9e
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 30 18:40:30 2010 +0200

    Drop patch use_cstdio_header

diff --git a/debian/changelog b/debian/changelog
index 8a45592..17bf78a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
     files in the diff)
   * Dropped patches:
     - dont_include_simple_rcs (we install the simplercs command)
+    - use_cstdio_header (applied upstream)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 23:01:38 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8ab888e..0aa7f52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 use_octave_htmldoc
 move_doc_under_doc
 build-out-of-source
-use_cstdio_header
diff --git a/debian/patches/use_cstdio_header b/debian/patches/use_cstdio_header
deleted file mode 100644
index 3a3f76a..0000000
--- a/debian/patches/use_cstdio_header
+++ /dev/null
@@ -1,11 +0,0 @@
-Include necessary headers for gcc-4.4, bug fix for 550264
---- a/easy_plot/src/gnuplot_connection.cpp
-+++ b/easy_plot/src/gnuplot_connection.cpp
-@@ -2,6 +2,7 @@
- #include <QXmlStreamReader>
- #include <QXmlStreamWriter>
- #include <QHash>
-+#include <cstdio>
- 
- GnuplotConnection::GnuplotConnection(QObject *parent):QProcess(parent)
- {

-- 
qtoctave