Added dcraw-m.dpatch.

This fixes the usage of dcraw's "-m" command line option.

diff --git a/debian/changelog b/debian/changelog
index 94567917925fa8d6f33b76780c6c6d5abb0cc454..a486968568ddcba66cbc3e4ce47d7397a2653203 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ pfstools (1.6.4-2) unstable; urgency=low
   * Switched to octave3.0, thanks to Thomas Weber for the patches
     (Closes: #458131).
     - Added octave3.0.dpatch including required changes for octave 3.0.
+  * Added dcraw-m.dpatch which fixes the usage of dcraw's "-m" command line
+    option (Closes: #464724).
 
- -- Sebastian Harl <sh@tokkee.org>  Mon, 31 Mar 2008 15:08:56 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Mon, 31 Mar 2008 16:38:54 +0200
 
 pfstools (1.6.4-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index f68e5a0a7dc16247791f109c8a87a033c9b03a2f..449264df2ad4e78e79c0a6ad673df078f7b51347 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
 octave3.0.dpatch
+dcraw-m.dpatch
 

diff --git a/debian/patches/dcraw-m.dpatch b/debian/patches/dcraw-m.dpatch
new file mode 100644 (file)
index 0000000..369e9f9
--- /dev/null
+++ b/debian/patches/dcraw-m.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dcraw-m.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Fixed the usage of dcraw(1)'s -m command line option.
+## DP: Somewhere in between versions 8.39 and 8.80 the meaning and syntax of
+## DP: dcraw's -m command line option has changed. Luckily -m used to be the
+## DP: same as the "-o 0" option, which still exists.
+
+@DPATCH@
+
+--- a/src/fileformat/pfsindcraw.in
++++ b/src/fileformat/pfsindcraw.in
+@@ -51,7 +51,7 @@
+ 
+       file_pattern=$1
+ 
+-      dcraw -c -m -4 -w $file_pattern | pfsinppm - 2> /dev/null | \
++      dcraw -c -o 0 -4 -w $file_pattern | pfsinppm - 2> /dev/null | \
+           pfstag --set "FILE_NAME=${file_pattern}" --set "LUMINANCE=RELATIVE"
+       
+       shift