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

[Thomas Weber]

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

    Drop patch add_missing_includes

diff --git a/debian/changelog b/debian/changelog
index a8f1f77..4dad00d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * This version works with Qt 4.6 (closes: #565197,584349)
   * Removed +dfsg from version; upstream has stopped distributing
     GPL-questionable docs.
+  * Dropped patches:
+    - add_missing_includes (partly superseded by code changes, partly applied)
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/add_missing_includes b/debian/patches/add_missing_includes
deleted file mode 100644
index 0a38fc4..0000000
--- a/debian/patches/add_missing_includes
+++ /dev/null
@@ -1,26 +0,0 @@
-Add missing stdio.h include directives.
-
- -- Jordi Gutiérrez Hermoso <jordigh at gmail.com>  Sun, 30 Nov 2008 15:40:20 +0000
-
-Index: qtoctave-0.8.1+dfsg/src/octave_connection.cpp
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/qtoctave/src/octave_connection.cpp	2008-11-27 02:23:46.000000000 -0600
-+++ qtoctave-0.8.1+dfsg/qtoctave/src/octave_connection.cpp	2008-11-27 02:23:53.000000000 -0600
-@@ -23,6 +23,7 @@
- #include <QMessageBox>
- #include <QFile>
- #include <QDir>
-+#include <stdio.h>
- 
- void Sleep::micro_sleep(unsigned long u_seconds)
- {
-Index: qtoctave-0.8.1+dfsg/src/search_dialog.cpp
-===================================================================
---- qtoctave-0.8.1+dfsg.orig/qtoctave/src/search_dialog.cpp	2008-11-27 02:23:46.000000000 -0600
-+++ qtoctave-0.8.1+dfsg/src/qtoctave/search_dialog.cpp	2008-11-27 02:23:50.000000000 -0600
-@@ -1,4 +1,5 @@
- #include "search_dialog.h"
-+#include <stdio.h>
- 
- SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
- {
diff --git a/debian/patches/series b/debian/patches/series
index ece85af..e72775c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 dont_include_simple_rcs
-add_missing_includes
 font-option-in-png-export
 use_octave_htmldoc
 move_doc_under_doc

-- 
qtoctave