← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/cups/jaunty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/quiesce_ipp_logging.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Till Kamppeter, Martin Pitt
  • Date: 2009-02-15 18:39:03 UTC
  • mfrom: (6.1.30 jaunty)
  • Revision ID: james.westby@ubuntu.com-20090215183903-i0nhvqyqj4vyn52a
Tags: 1.3.9-13
https://launchpad.net/bugs/309314
https://launchpad.net/bugs/303691
https://launchpad.net/bugs/310575
https://launchpad.net/bugs/310575
[ Till Kamppeter ]
* debian/local/filters/pdf-filters/filter/imagetopdf.c: Added support for
  the new "fit-to-page" option (new, more intuitive name for "fitplot").
* debian/filters/pstopdf: Only apply paper size if the "fitplot" or the
  "fit-to-page" option is set.
* debian/local/filters/cpdftocps: Only the last digit of the number of
  copies was used (LP: #309314).
* debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx: Do not preceed the
  PDF output with a newline (LP: #303691). Only impose the page size from
  the PPD file to all pages if the "fitplot" or the "fit-to-page" option is 
  set. This prevented from automatic paper tray switching to the correct paper
  sizes when a multiple-page-size document is printed (partial fix for
  LP: #310575).
* debian/patches/pdftops-cups-1.4.dpatch: Updated from CUPS 1.4 SVN. Contains
  fixes for multiple-page-size document printing (partial fix for
  LP: #310575).
* debian/patches/pdftops-dont_fail_on_cancel.dpatch: Removed, should be
  fixed in the new upstream version of pdftops.

[ Martin Pitt ]
* debian/patches/pdftops-cups-1.4.dpatch: Add definition of
  HAVE_PDFTOPS and CUPS_PDFTOPS, so that the filter actually gets
  again built with pdftops support. (Fixes Till's change from above).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/quiesce_ipp_logging.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 12_quiesce_ipp_logging.dpatch by  <mpitt@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad cups-1.2.2~/scheduler/log.c cups-1.2.2/scheduler/log.c
9
 
--- cups-1.2.2~/scheduler/log.c 2006-08-13 04:49:19.000000000 +0000
10
 
+++ cups-1.2.2/scheduler/log.c  2006-08-13 05:17:06.000000000 +0000
11
 
@@ -354,6 +354,12 @@
12
 
                  "STATUS"
13
 
                };
14
 
 
15
 
+  /* Do not flood the log with CUPS-Get-Printers requests */
16
 
+  if (con->request && code == HTTP_OK && (
17
 
+       con->request->request.op.operation_id == CUPS_GET_PRINTERS ||
18
 
+       con->request->request.op.operation_id == CUPS_GET_DEFAULT ||
19
 
+       con->request->request.op.operation_id == IPP_GET_PRINTER_ATTRIBUTES))
20
 
+      return (1);
21
 
 
22
 
 #ifdef HAVE_VSYSLOG
23
 
  /*