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

« back to all changes in this revision

Viewing changes to ppdc/ppdc-import.cxx

  • 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: ppdc-import.cxx 8606 2009-05-08 18:14:27Z mike $"
 
2
// "$Id: ppdc-import.cxx 9793 2011-05-20 03:49:49Z mike $"
3
3
//
4
4
//   PPD file import methods for the CUPS PPD Compiler.
5
5
//
6
 
//   Copyright 2007-2008 by Apple Inc.
 
6
//   Copyright 2007-2011 by Apple Inc.
7
7
//   Copyright 2002-2006 by Easy Software Products.
8
8
//
9
9
//   These coded instructions, statements, and computer programs are the
24
24
 
25
25
#include "ppdc-private.h"
26
26
#include <cups/ppd.h>
27
 
#include <cups/i18n.h>
28
27
 
29
28
 
30
29
//
102
101
 
103
102
    // Then add the stuff from the PPD file...
104
103
    if (ppd->modelname && ppd->manufacturer &&
105
 
        !strncasecmp(ppd->modelname, ppd->manufacturer,
 
104
        !_cups_strncasecmp(ppd->modelname, ppd->manufacturer,
106
105
                     strlen(ppd->manufacturer)))
107
106
    {
108
107
      ptr = ppd->modelname + strlen(ppd->manufacturer);
172
171
    for (i = ppd->num_sizes, size = ppd->sizes; i > 0; i --, size ++)
173
172
    {
174
173
      // Don't do custom size here...
175
 
      if (!strcasecmp(size->name, "Custom"))
 
174
      if (!_cups_strcasecmp(size->name, "Custom"))
176
175
        continue;
177
176
 
178
177
      // Get the code for the PageSize and PageRegion options...
188
187
 
189
188
       driver->add_size(csize);
190
189
 
191
 
       if (!strcasecmp(size_option->defchoice, size->name))
 
190
       if (!_cups_strcasecmp(size_option->defchoice, size->name))
192
191
         driver->set_default_size(csize);
193
192
    }
194
193
 
216
215
          cchoice = new ppdcChoice(choice->choice, choice->text, choice->code);
217
216
          coption->add_choice(cchoice);
218
217
 
219
 
          if (!strcasecmp(option->defchoice, choice->choice))
 
218
          if (!_cups_strcasecmp(option->defchoice, choice->choice))
220
219
            coption->set_defchoice(cchoice);
221
220
        }
222
221
      }
262
261
        if (sscanf(attr->value, "%s%*[^\"]\"%[^\"]\"%s%s", encoding, version,
263
262
                   charset, status) != 4)
264
263
        {
265
 
          _cupsLangPrintf(stderr, _("Bad font attribute: %s\n"), attr->value);
 
264
          _cupsLangPrintf(stderr, _("ppdc: Bad font attribute: %s"),
 
265
                          attr->value);
266
266
          continue;
267
267
        }
268
268
 
339
339
 
340
340
 
341
341
//
342
 
// End of "$Id: ppdc-import.cxx 8606 2009-05-08 18:14:27Z mike $".
 
342
// End of "$Id: ppdc-import.cxx 9793 2011-05-20 03:49:49Z mike $".
343
343
//