diff -u plucker-1.8/debian/patches/00list plucker-1.8/debian/patches/00list --- plucker-1.8/debian/patches/00list +++ plucker-1.8/debian/patches/00list @@ -9,0 +10 @@ +80_remove_quiet diff -u plucker-1.8/debian/control plucker-1.8/debian/control --- plucker-1.8/debian/control +++ plucker-1.8/debian/control @@ -1,7 +1,8 @@ Source: plucker Section: otherosfs Priority: optional -Maintainer: Ludovic Rousseau +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ludovic Rousseau Build-Depends: debhelper (>= 5.0.37.2), autoconf, python (>= 2.3.5-7), python-central (>= 0.5), libjpeg62-dev, dpatch, zlib1g-dev, libgtk2.0-dev XS-Python-Version: current Standards-Version: 3.7.2 diff -u plucker-1.8/debian/changelog plucker-1.8/debian/changelog --- plucker-1.8/debian/changelog +++ plucker-1.8/debian/changelog @@ -1,3 +1,14 @@ +plucker (1.8-21ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: 80_remove_quiet.dpatch fixes invocation + in parser/python/PyPlucker/ImageParser.py (Closes Ubuntu: #54377) + * debian/control: Changed maintainer field for Ubuntu: + - Maintainer: Ubuntu MOTU Developers + - XSBC-Original-Maintainer: Ludovic Rousseau + + -- Richard A. Johnson Sun, 03 Jun 2007 18:43:18 -0500 + plucker (1.8-21) unstable; urgency=low * the plucker-desktop package can't be built anymore, drop it. @@ -9,6 +20,14 @@ -- Ludovic Rousseau Tue, 08 May 2007 21:21:29 +0200 +plucker (1.8-20ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: 80_remove_quiet.dpatch fixes invocation + in parser/python/PyPlucker/ImageParser.py (Closes Ubuntu: #54377) + + -- Richard A. Johnson Thu, 23 Nov 2006 11:02:48 -0600 + plucker (1.8-20) unstable; urgency=low * debian/rules: use /usr/share/pycentral/plucker instdead of @@ -48,6 +67,12 @@ -- Debian/i386 Build Daemon Tue, 22 Aug 2006 02:55:37 -0700 +plucker (1.8-16ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Daniel T Chen Tue, 08 Aug 2006 00:43:00 +0100 + plucker (1.8-16) unstable; urgency=low * debian/rules: use --with-pluckerdir= and --with-docdir=. Closes: #381527 @@ -57,6 +82,13 @@ -- Ludovic Rousseau Mon, 7 Aug 2006 01:03:15 +0200 +plucker (1.8-15ubuntu1) edgy; urgency=low + + * Add debian/patches/80_remove_quiet.dpatch to fix command invocation + in parser/python/PyPlucker/ImageParser.py (Closes Ubuntu: #54377). + + -- Daniel T Chen Fri, 28 Jul 2006 14:14:53 -0400 + plucker (1.8-15) unstable; urgency=low * debian/control: add Build-Depends: zlib1g-dev, libgtk2.0-dev. Closes: @@ -417 +448,0 @@ - only in patch2: unchanged: --- plucker-1.8.orig/debian/patches/80_remove_quiet.dpatch +++ plucker-1.8/debian/patches/80_remove_quiet.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_remove_quiet.dpatch by Daniel T Chen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Strip instances of 'quiet' from parser/python/PyPlucker/ImageParser.py, +## DP: closes Ubuntu: #54377 (related to Debian: #182361) + +@DPATCH@ + +--- plucker-1.8/parser/python/PyPlucker/ImageParser.py 2004-03-23 16:17:38.000000000 -0500 ++++ plucker-1.8/parser/python/PyPlucker/ImageParser.py 2006-07-28 14:10:05.000000000 -0400 +@@ -389,7 +389,7 @@ + ppmtoTbmp = ppmtoTbmp + " -4bit" + + if self._verbose <= 1: +- ppmtoTbmp = ppmtoTbmp + " -quiet" ++ ppmtoTbmp = ppmtoTbmp + " " + + outfile = tempfile.mktemp() + +@@ -678,8 +678,8 @@ + ppmtoTbmp = ppmtoTbmp + " -4bit" + + if self._verbose <= 1: +- ppmtoTbmp = ppmtoTbmp + " -quiet " +- ppmquant = ppmquant + " -quiet " ++ ppmtoTbmp = ppmtoTbmp + " " ++ ppmquant = ppmquant + " " + + if not self.scale: + command = ppmquant + tmpfile + "|" + ppmtoTbmp +@@ -888,8 +888,8 @@ + if self._verbose > 1: + ppmtoTbmp = ppmtoTbmp + " -verbose " + else: +- ppmtoTbmp = ppmtoTbmp + " -quiet " +- ppmquant = ppmquant + " -quiet " ++ ppmtoTbmp = ppmtoTbmp + " " ++ ppmquant = ppmquant + " " + + if not scale_cmd: + command = ppmquant + ppmquant2 + "|" + ppmtoTbmp +@@ -1023,8 +1023,8 @@ + raise RuntimeError, "Can't handle depth of " + str(self._bpp) + + if self._verbose <= 1: +- ppmtoTbmp = ppmtoTbmp + " -quiet " +- ppmquant = ppmquant + " -quiet " ++ ppmtoTbmp = ppmtoTbmp + " " ++ ppmquant = ppmquant + " " + + command = "cat " + tmpfile + " | " + ppmquant + " |" + ppmtoTbmp +