From 1b22f8942af89bafbfe8317234531af3c19dc56a Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 26 Dec 2007 15:29:56 +0100 Subject: [PATCH] Added gcc-4.3-includes.dpatch: Add missing includes required by gcc-4.3. --- debian/changelog | 5 +- debian/control | 2 +- debian/patches/00list | 2 + debian/patches/gcc4.3-includes.dpatch | 138 ++++++++++++++++++++++++++ debian/rules | 5 +- 5 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 debian/patches/00list create mode 100644 debian/patches/gcc4.3-includes.dpatch diff --git a/debian/changelog b/debian/changelog index 5d67096..21cd13e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,15 @@ pfstools (1.6.2-2) unstable; urgency=low * Downgraded pfstool's requirement on octave{,pfstools} to a recommendation (Closes: #445909). * Removed a bashism from debian/rules (Closes: #456508). + * Added gcc4.3-includes.dpatch: Add missing includes required by gcc-4.3 + (Closes: #455648): + - Added build dependency on dpatch. * Renamed "XS-Vcs-*" fields to Vcs-* and moved "Homepage" field from the package description to the source stanza: - Added versioned build dependency on dpkg-dev (>= 1.14.6). * Updated to standards version 3.7.3 (no changes). - -- Sebastian Harl Wed, 26 Dec 2007 13:23:56 +0100 + -- Sebastian Harl Wed, 26 Dec 2007 15:15:03 +0100 pfstools (1.6.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 96400ec..6d674d9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pfstools Section: graphics Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), gfortran, autotools-dev, libqt3-mt-dev, libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave2.1-headers, tetex-bin, freeglut3-dev +Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave2.1-headers, tetex-bin, freeglut3-dev Build-Conflicts: octave2.9-headers Standards-Version: 3.7.3 Homepage: http://www.mpi-inf.mpg.de/resources/pfstools/ diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..54bdc9c --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +gcc4.3-includes.dpatch + diff --git a/debian/patches/gcc4.3-includes.dpatch b/debian/patches/gcc4.3-includes.dpatch new file mode 100644 index 0000000..aa65c04 --- /dev/null +++ b/debian/patches/gcc4.3-includes.dpatch @@ -0,0 +1,138 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gcc4.3-includes.dpatch by Sebastian Harl +## +## DP: This patch adds missing includes required by gcc-4.3. + +@DPATCH@ + +--- a/src/fileformat/pfsinexr.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/fileformat/pfsinexr.cpp 2007-12-26 13:36:04.000000000 +0100 +@@ -27,6 +27,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsinppm.cpp 2007-02-09 14:19:26.000000000 +0100 ++++ b/src/fileformat/pfsinppm.cpp 2007-12-26 13:34:39.000000000 +0100 +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsinrgbe.cpp 2006-11-06 17:39:13.000000000 +0100 ++++ b/src/fileformat/pfsinrgbe.cpp 2007-12-26 13:33:52.000000000 +0100 +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsintiff.cpp 2007-04-03 10:30:23.000000000 +0200 ++++ b/src/fileformat/pfsintiff.cpp 2007-12-26 13:35:19.000000000 +0100 +@@ -27,6 +27,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsoutexr.cpp 2005-07-18 17:47:17.000000000 +0200 ++++ b/src/fileformat/pfsoutexr.cpp 2007-12-26 13:36:28.000000000 +0100 +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsoutppm.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/fileformat/pfsoutppm.cpp 2007-12-26 13:34:59.000000000 +0100 +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsoutrgbe.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/fileformat/pfsoutrgbe.cpp 2007-12-26 13:34:14.000000000 +0100 +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/fileformat/pfsouttiff.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/fileformat/pfsouttiff.cpp 2007-12-26 13:35:42.000000000 +0100 +@@ -27,6 +27,8 @@ + + #include + ++#include ++ + #include + + #include +--- a/src/filter/pfscat.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/filter/pfscat.cpp 2007-12-26 13:45:47.000000000 +0100 +@@ -25,6 +25,7 @@ + */ + + #include ++#include + #include + #include + #include +--- a/src/filter/pfscut.cpp 2006-08-18 02:31:24.000000000 +0200 ++++ b/src/filter/pfscut.cpp 2007-12-26 13:45:18.000000000 +0100 +@@ -25,6 +25,8 @@ + */ + + #include ++#include ++#include + #include + #include + +--- a/src/filter/pfspad.cpp 2005-06-15 15:36:54.000000000 +0200 ++++ b/src/filter/pfspad.cpp 2007-12-26 13:44:57.000000000 +0100 +@@ -26,6 +26,8 @@ + + + #include ++#include ++#include + #include + #include + +--- a/src/pfs/pfs.cpp 2006-11-06 17:39:15.000000000 +0100 ++++ b/src/pfs/pfs.cpp 2007-12-26 13:32:38.000000000 +0100 +@@ -36,6 +36,8 @@ + #define HAVE_SETMODE + #endif + ++#include ++ + #include + + #include diff --git a/debian/rules b/debian/rules index 027f1c2..760b5c7 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,9 @@ else endif include /usr/share/octave/debian/defs.make +include /usr/share/dpatch/dpatch.make -config.status: configure +config.status: configure $(DPATCH_STAMPFN) dh_testdir for file in config.guess config.sub; do \ @@ -47,7 +48,7 @@ build-stamp: config.status touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp -- 2.30.2