r128 - in trunk/debian: . patches

[rousseau at alioth.debian.org]

Author: rousseau
Date: 2008-03-21 16:54:10 +0000 (Fri, 21 Mar 2008)
New Revision: 128

Added:
   trunk/debian/patches/21_bins-trim.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
add -trim argument to jpegtran.  Closes: #284157: "bins: avoidable
jpegtran image corruption"


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-21 16:46:20 UTC (rev 127)
+++ trunk/debian/changelog	2008-03-21 16:54:10 UTC (rev 128)
@@ -9,8 +9,10 @@
     non-existing package"
   * debian/rules: use binary-indep: instead of binary-arch: target to avoid a
     binary-arch-rules-but-pkg-is-arch-indep lintian warning
+  * debian/patches/21_bins-trim.dpatch: add -trim argument to jpegtran.
+    Closes: #284157: "bins: avoidable jpegtran image corruption"
 
- -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 17:41:38 +0100
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 21 Mar 2008 17:52:15 +0100
 
 bins (1.1.29-9) unstable; urgency=low
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-03-21 16:46:20 UTC (rev 127)
+++ trunk/debian/patches/00list	2008-03-21 16:54:10 UTC (rev 128)
@@ -15,3 +15,4 @@
 18_bins-memory-leak
 19_bins-insert-directory
 20_bins-syscall
+21_bins-trim

Added: trunk/debian/patches/21_bins-trim.dpatch
===================================================================
--- trunk/debian/patches/21_bins-trim.dpatch	                        (rev 0)
+++ trunk/debian/patches/21_bins-trim.dpatch	2008-03-21 16:54:10 UTC (rev 128)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21_bins-trim.dpatch by  <rousseau at imac.maison.bogus>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add -trim argument to jpegtran.
+## DP: Closes: #284157: bins: avoidable jpegtran image corruption
+
+ at DPATCH@
+diff -urNad bins-1.1.29~/bins bins-1.1.29/bins
+--- bins-1.1.29~/bins	2005-08-25 00:07:06.000000000 +0200
++++ bins-1.1.29/bins	2008-03-21 17:50:24.000000000 +0100
+@@ -4776,7 +4776,7 @@
+         if ($rotateJPEG eq "none") {
+             beVerbose("\n  Looking for a JPEG rotation utility (jpegtran)... ", 3);
+             if (commandAvailable("jpegtran")) {
+-                $rotateJPEG = 'jpegtran -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
++                $rotateJPEG = 'jpegtran -trim -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
+                 beVerboseN(" found jpegtran.", 3);
+             } elsif (commandAvailable("jpegtran-mmx")) {
+                 $rotateJPEG = 'jpegtran-mmx -copy all -rotate %s -outfile "%s.tmp" "%s" && mv "%s.tmp" "%s"';
+@@ -4883,7 +4883,7 @@
+         if ($progressifyJPEG eq "none") {
+             beVerbose("\n  Looking for a progressive JPEG utility (jpegtran)... ", 3);
+             if (commandAvailable("jpegtran")) {
+-                $progressifyJPEG = 'jpegtran -copy all -progressive -outfile "%s" "%s"';
++                $progressifyJPEG = 'jpegtran -trim -copy all -progressive -outfile "%s" "%s"';
+                 beVerboseN(" found jpegtran.", 3);
+             } else {
+                 $progressifyJPEG = "";


Property changes on: trunk/debian/patches/21_bins-trim.dpatch
___________________________________________________________________
Name: svn:executable
   + *