From 93ecb954aa175a30ae388ba76f37a511fdd84309 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 7 Jun 2009 14:09:54 +0200 Subject: [PATCH] patches: Removed dcraw-m.dpatch. This patch has been merged upstream. --- debian/changelog | 4 +++- debian/patches/00list | 1 - debian/patches/dcraw-m.dpatch | 21 --------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/dcraw-m.dpatch diff --git a/debian/changelog b/debian/changelog index 62946fb..d998b8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ pfstools (1.8.1-1) unstable; urgency=low * New upstream release. + * debian/patches: + - Removed dcraw-m.dpatch - merged upstream. - -- Sebastian Harl Sun, 07 Jun 2009 14:00:25 +0200 + -- Sebastian Harl Sun, 07 Jun 2009 14:07:15 +0200 pfstools (1.6.4-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 449264d..f68e5a0 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,2 @@ octave3.0.dpatch -dcraw-m.dpatch diff --git a/debian/patches/dcraw-m.dpatch b/debian/patches/dcraw-m.dpatch deleted file mode 100644 index 369e9f9..0000000 --- a/debian/patches/dcraw-m.dpatch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## dcraw-m.dpatch by Sebastian Harl -## -## 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 -- 2.30.2