Updated to new upstream release 1.6.4.

 * Updated changelog.
 * Removed gcc4.3-includes.dpatch - has been included upstream.
 * Removed dpatch build dependency.

diff --git a/debian/changelog b/debian/changelog
index 09fdb8dcfb0d3c693091c7fc6375bdb0e1bc0263..71ac7c0e9c27f524b41a58a235e6b0984c3e3414 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,12 @@
-pfstools (1.6.2-2) unstable; urgency=low
+pfstools (1.6.4-1) unstable; urgency=low
 
+  * New upstream release.
+    - Added missing includes required by gcc-4.3 (Closes: #455648).
   * Downgraded pfstool's requirement on octave{,pfstools} to a recommendation
     (Closes: #445909).
   * Added new binary packages for pfsglview and pfsview to prevent users from
     having to install OpenGL/GLUT and Qt.
   * 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).
@@ -16,7 +15,7 @@ pfstools (1.6.2-2) unstable; urgency=low
     - Moved myself to uploaders.
   * Added a watch file, thanks to Cyril Brulebois.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 25 Jan 2008 19:16:21 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 27 Jan 2008 17:33:12 +0100
 
 pfstools (1.6.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 082051f1bf54e20f95e85b581053ef078a40b4ea..64014498686973ae75847b7542f5b16a622473b3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Sebastian Harl <sh@tokkee.org>
-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-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-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
deleted file mode 100644 (file)
index 54bdc9c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc4.3-includes.dpatch
-

diff --git a/debian/patches/gcc4.3-includes.dpatch b/debian/patches/gcc4.3-includes.dpatch
deleted file mode 100644 (file)
index aa65c04..0000000
--- a/debian/patches/gcc4.3-includes.dpatch
+++ /dev/null
@@ -1,138 +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/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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <stdio.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <stdio.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <config.h>
- 
-+#include <cstdlib>
-+
- #include <iostream>
- 
- #include <getopt.h>
---- 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 <pfs.h>
-+#include <climits>
- #include <iostream>
- #include <getopt.h>
- #include <fcntl.h>
---- 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 <pfs.h>
-+#include <climits>
-+#include <cstdlib>
- #include <iostream>
- #include <getopt.h>
- 
---- 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 <pfs.h>
-+#include <climits>
-+#include <cstdlib>
- #include <iostream>
- #include <getopt.h>
- 
---- 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 <cstdlib>
-+
- #include <fcntl.h>
- 
- #include <string.h>

diff --git a/debian/rules b/debian/rules
index cd793efb7395a4b82ebede1b02dcc1f99f130f5b..84752e94a5b582a759594084f3d9053bbe4d13ef 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,8 @@ else
 endif
 
 include /usr/share/octave/debian/defs.make
-include /usr/share/dpatch/dpatch.make
 
-config.status: configure $(DPATCH_STAMPFN)
+config.status: configure
        dh_testdir
        
        for file in config.guess config.sub; do \
@@ -48,7 +47,7 @@ build-stamp: config.status
        
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp