patches: Removed octave3.0.dpatch.

This patch has been merged upstream.

diff --git a/debian/changelog b/debian/changelog
index d998b8d5a2862c6888e438f17a04f0759bb8d33f..3da794a33209ba4161df31380da5c0b378e4045f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ pfstools (1.8.1-1) unstable; urgency=low
   * New upstream release.
   * debian/patches:
     - Removed dcraw-m.dpatch - merged upstream.
+    - Removed octave3.0.dpatch - merged upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 07 Jun 2009 14:07:15 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 07 Jun 2009 14:10:40 +0200
 
 pfstools (1.6.4-2) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index f68e5a0a7dc16247791f109c8a87a033c9b03a2f..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
-octave3.0.dpatch
 

diff --git a/debian/patches/octave3.0.dpatch b/debian/patches/octave3.0.dpatch
deleted file mode 100644 (file)
index 3de9acd..0000000
--- a/debian/patches/octave3.0.dpatch
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## octave3.0.dpatch by Thomas Weber <thomas.weber.mail@gmail.com>
-##
-## DP: Changes required to switch to octave3.0.
-
-@DPATCH@
-
---- a/src/octave/pfsopen.cpp
-+++ b/src/octave/pfsopen.cpp
-@@ -54,8 +54,9 @@ DEFUN_DLD( pfsopen, args, , helpString)
-     return retval;
-   }
- 
--  if( !args(0).is_string() && !args(0).is_stream() ) {
-+  if( !args(0).is_string() && !args(0).is_real_scalar() ) {
-     error( SCRIPT_NAME ": expected file name or file descriptor as the first argument!");
-+    // file descriptors are represented as integers (stored as doubles) in Octave 3.0
-     return retval;
-   }
- 
-@@ -120,8 +121,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
-     }
-   } else {
-     // File descriptor given
--    octave_stream fid = args(0).stream_value();
--    int fd = dup( fid.file_number() );
-+    int fd = dup( (int) args(0).scalar_value() );
-     if( writeMode ) {
-       fh = fdopen( fd, "wb" );
-       if( fh == NULL ) {
---- a/src/octave/pfsoctavelum
-+++ b/src/octave/pfsoctavelum
-@@ -33,7 +33,7 @@ if( length( argv ) != 1 )
-   error( "Expecting exactly one parameter with octave code to be execuded" );
- endif
-
--command = argv{1};
-+command = argv(){1};
-
- ## Add missing ';'
- if( command(length(command)) != ";" )
---- a/src/octave/pfsoctavergb
-+++ b/src/octave/pfsoctavergb
-@@ -33,7 +33,7 @@ if( length( argv ) != 1 )
-   error( "Expecting exactly one parameter with octave code to be execuded" );
- endif
-
--command = argv{1};
-+command = argv(){1};
-
- ## Add missing ';'
- if( command(length(command)) != ";" )