From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 7 Oct 2008 12:02:57 +0000 (+0200)
Subject: Removed gcc4.3-includes.dpatch.
X-Git-Tag: enblend-enfuse-3.2+dfsg-1~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3358f1dcca59954aecca21559ec51b83767c2b15;p=pkg-enblend.git

Removed gcc4.3-includes.dpatch.

The fix for this issue has been included upstream.
---

diff --git a/debian/changelog b/debian/changelog
index ee23ff0..3792007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ enblend (3.2+dfsg-1) unstable; urgency=low
   * New upstream release (Closes: #491370).
   * debian/rules:
     - Include AUTHORS file in the package as well.
+  * debian/patches:
+    - Removed gcc4.3-includes.dpatch - included upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Tue, 07 Oct 2008 13:12:43 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Tue, 07 Oct 2008 14:01:25 +0200
 
 enblend (3.0+dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 69a7b12..d1c5651 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
 type_mismatch.dpatch
-gcc4.3-includes.dpatch
 
diff --git a/debian/patches/gcc4.3-includes.dpatch b/debian/patches/gcc4.3-includes.dpatch
deleted file mode 100644
index 0d05417..0000000
--- a/debian/patches/gcc4.3-includes.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc4.3-includes.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: This patch adds missing includes required by gcc-4.3.
-
-@DPATCH@
-
---- a/include/vigra/imageiteratoradapter.hxx	2007-01-27 05:54:46.000000000 +0100
-+++ b/include/vigra/imageiteratoradapter.hxx	2007-12-27 18:15:52.000000000 +0100
-@@ -38,6 +38,8 @@
- #ifndef VIGRA_IMAGEITERATORADAPTER_HXX
- #define VIGRA_IMAGEITERATORADAPTER_HXX
- 
-+#include <cstdlib>
-+
- #include <iterator>   // iterator tags
- 
- namespace vigra {
---- a/src/gpu.cc	2006-12-08 09:40:58.000000000 +0100
-+++ b/src/gpu.cc	2007-12-28 04:04:49.000000000 +0100
-@@ -18,6 +18,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include "gpu.h"