~ubuntu-branches/ubuntu/oneiric/cups/oneiric-proposed

« back to all changes in this revision

Viewing changes to backend/backend-private.h

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Till Kamppeter, Martin Pitt
  • Date: 2011-08-07 12:53:12 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20110807125312-s323cyb3oqaxaemo
Tags: 1.5.0-1
[ Till Kamppeter ]
* New upstream release
* debian/patches/usb-backend-no-segfault-on-bad-device-id.patch,
  debian/patches/usb-backend-accept-old-usblp-uris.patch,
  debian/patches/use-ps2write-ghostscript-device-for-pdftops-filter.patch:
  Removed, included upstream.
* debian/patches/poppler-based-pdftops-fixes.patch,
  debian/patches/do-not-emit-ps-level-3-with-poppler.patch: Replaced patch
  by a new one only containing the parts which remain after removing the
  parts included upstream.
* debian/patches/pidfile.patch,
  debian/patches/ppd-poll-with-client-conf.patch,
  debian/patches/cups-avahi.patch,
  debian/patches/drop_unnecessary_dependencies.patch,
  debian/patches/do-not-broadcast-with-hostnames.patch,
  debian/patches/ppdc-dynamic-linking.patch,
  debian/patches/pstops-based-workflow-only-for-printing-ps-on-a-ps-printer.patch:
  Manually regenerated to adapt to upstream changes.
* debian/patches/manpage-translations.patch,
  debian/patches/rootbackends-worldreadable.patch,
  debian/patches/no-conffile-timestamp.patch,
  debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
  debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch,
  debian/patches/configure-default-browse-protocols.patch,
  debian/patches/logfiles_adm_readable.patch,
  debian/patches/confdirperms.patch,
  debian/patches/printer-filtering.patch,
  debian/patches/show-compile-command-lines.patch,
  debian/patches/log-debug-history-nearly-unlimited.patch:
  Refreshed using quilt.
* debian/patches/default-ripcache-size-auto.patch: Dropped, as once,
  Ghostscript 9.04 is ignoring the cache size value as it crashes easily
  otherwise (Ghostscript upstream bug #691586) and second, CUPS defaults to
  more reasonable 128 MB (now only used for imagetops).
* debian/patches/support-gzipped-charmaps.patch: Dropped, as the SBCS and
  VBCS character maps are not used any more by CUPS.
* debian/rules: Enable threads in the ./configure command line, as otherwise
  CUPS 1.5.0 does not build at all.
* debian/local/filters/pdf-filters/filter/pdftoijs.cxx,
  debian/local/filters/pdf-filters/filter/pdftoraster.cxx,
  debian/local/filters/pdf-filters/pdftoopvp/pdftoopvp.cxx,
  debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx: Under CUPS 1.5.x.
  all programs using the PPD API of CUPS need to explicitly include
  "<cups/ppd.h>". Updated the PDF filter add-on package.
* debian/local/filters/pdf-filters/addtocups: Make the addition of the
  pdftopdf and pdftoopvp directories also work with CUPS 1.5.x.
* debian/local/filters/pdf-filters/addtocups,
  debian/local/filters/pdf-filters/removefromcups: Added a symbolic link
  cups/i18n.h, so that texttopdf builds.
* debian/cups-client.install: Install the new ipptool and its sample
  files and manpages.
* debian/cups-client.install: Commented out lines for dropped man page
  translations: ipptool, lppasswd, client.conf, ipptoolfile, cupsenable,
  lpadmin, lpinfo, cupsreject, cupsdisable, cupsaccept
* debian/cups-common.install, debian/rules: The /usr/share/cups/charmaps
  directory got removed from CUPS.
* debian/libcups2-dev.install: cups/i18n.h got renamed to
  cups/language-private.h. Install this as /usr/include/cups/i18n.h.
* debian/libcups2.symbols, debian/libcupsmime1.symbols: Updated.
* debian/cups.lintian-overrides, debian/cups.postinst, debian/cups.prerm,
  debian/cups.templates, debian/local/apparmor-profile: The "scsi"
  CUPS backend got dropped upstream, removed its treatment from these files.

[ Martin Pitt ]
* Add Serbian (Cyrillic) debconf translations, thanks Zlatan Todoric.
  (Closes: #635105)
* Add Serbian (Latin) debconf translations, thanks Zlatan Todoric.
  (Closes: #635108)
* debian/local/apparmor-profile: Allow access to serial printers on USB
  adapters. (LP: #677432)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * "$Id: backend-private.h 8912 2009-12-08 02:13:42Z mike $"
3
 
 *
4
 
 *   Backend support definitions for the Common UNIX Printing System (CUPS).
5
 
 *
6
 
 *   Copyright 2007-2009 by Apple Inc.
 
2
 * "$Id: backend-private.h 9577 2011-03-04 18:02:45Z mike $"
 
3
 *
 
4
 *   Backend support definitions for CUPS.
 
5
 *
 
6
 *   Copyright 2007-2011 by Apple Inc.
7
7
 *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
8
8
 *
9
9
 *   These coded instructions, statements, and computer programs are the
23
23
 * Include necessary headers.
24
24
 */
25
25
 
 
26
#  include <cups/cups-private.h>
 
27
#  include <cups/snmp-private.h>
26
28
#  include <cups/backend.h>
27
29
#  include <cups/sidechannel.h>
28
 
#  include <cups/ppd-private.h>
29
 
#  include <cups/debug.h>
30
 
#  include <cups/i18n.h>
31
 
#  include <cups/snmp-private.h>
32
 
#  include <stdlib.h>
33
 
#  include <errno.h>
34
 
#  include <cups/string.h>
35
30
#  include <signal.h>
36
31
 
37
32
#  ifdef __linux
282
277
 
283
278
 
284
279
/*
 
280
 * Types...
 
281
 */
 
282
 
 
283
typedef int (*_cups_sccb_t)(int print_fd, int device_fd, int snmp_fd,
 
284
                            http_addr_t *addr, int use_bc);
 
285
 
 
286
 
 
287
/*
285
288
 * Prototypes...
286
289
 */
287
290
 
300
303
                                             int snmp_fd, http_addr_t *addr,
301
304
                                             int use_bc);
302
305
extern ssize_t          backendRunLoop(int print_fd, int device_fd, int snmp_fd,
303
 
                                       http_addr_t *addr, int use_bc, 
304
 
                                       int update_state, 
305
 
                                       int (*side_cb)(int print_fd,
306
 
                                                      int device_fd,
307
 
                                                      int snmp_fd,
308
 
                                                      http_addr_t *addr,
309
 
                                                      int use_bc));
 
306
                                       http_addr_t *addr, int use_bc,
 
307
                                       int update_state, _cups_sccb_t side_cb);
310
308
extern int              backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
311
309
                                            int *page_count,
312
310
                                            int *printer_state);
 
311
extern int              backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
312
                                        int use_bc, _cups_sccb_t side_cb);
 
313
 
313
314
 
314
315
#  ifdef __cplusplus
315
316
}
318
319
 
319
320
 
320
321
/*
321
 
 * End of "$Id: backend-private.h 8912 2009-12-08 02:13:42Z mike $".
 
322
 * End of "$Id: backend-private.h 9577 2011-03-04 18:02:45Z mike $".
322
323
 */