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

« back to all changes in this revision

Viewing changes to .pc/drop_unnecessary_dependencies.patch/Makedefs.in

  • 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: Makedefs.in 9120 2010-04-23 18:56:34Z mike $"
 
2
# "$Id: Makedefs.in 9737 2011-05-04 04:28:00Z mike $"
3
3
#
4
4
#   Common makefile definitions for CUPS.
5
5
#
6
 
#   Copyright 2007-2010 by Apple Inc.
 
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
83
83
LIBCUPSIMAGE    =       @LIBCUPSIMAGE@
84
84
LIBCUPSMIME     =       @LIBCUPSMIME@
85
85
LIBCUPSPPDC     =       @LIBCUPSPPDC@
 
86
LIBCUPSSTATIC   =       @LIBCUPSSTATIC@
86
87
LIBJPEG         =       @LIBJPEG@
87
88
LIBLDAP         =       @LIBLDAP@
88
89
LIBMALLOC       =       @LIBMALLOC@
102
103
INSTALLSTATIC   =       @INSTALLSTATIC@
103
104
 
104
105
#
 
106
# IPP backend aliases...
 
107
#
 
108
 
 
109
IPPALIASES      =       @IPPALIASES@
 
110
 
 
111
#
 
112
# Install XPC backends?
 
113
#
 
114
 
 
115
INSTALLXPC      =       @INSTALLXPC@
 
116
 
 
117
#
105
118
# Program options...
106
119
#
107
120
# ARCHFLAGS     Defines the default architecture build options.
123
136
ARFLAGS         =       @ARFLAGS@
124
137
BACKLIBS        =       @BACKLIBS@
125
138
BANNERTOPS      =       @BANNERTOPS@
 
139
BUILDDIRS       =       @BUILDDIRS@
126
140
CFLAGS          =       @CPPFLAGS@ @CFLAGS@
127
141
COMMONLIBS      =       @LIBS@
128
 
CUPSDLIBS       =       @CUPSDLIBS@
129
142
CXXFLAGS        =       @CPPFLAGS@ @CXXFLAGS@
130
143
CXXLIBS         =       @CXXLIBS@
131
144
DBUS_NOTIFIER   =       @DBUS_NOTIFIER@
142
155
                        -L../scheduler @LDARCHFLAGS@ \
143
156
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
144
157
LEGACY_BACKENDS =       @LEGACY_BACKENDS@
145
 
LIBCUPSORDER    =       @LIBCUPSORDER@
146
 
LIBCUPSIMAGEORDER =     @LIBCUPSIMAGEORDER@
147
 
LINKCUPS        =       @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
 
158
LINKCUPS        =       @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
148
159
LINKCUPSIMAGE   =       @LINKCUPSIMAGE@
149
160
LIBS            =       $(LINKCUPS) $(COMMONLIBS)
150
161
OPTIM           =       @OPTIM@
154
165
PDFTOPS         =       @PDFTOPS@
155
166
PHPDIR          =       @PHPDIR@
156
167
PHPOPTIONS      =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 
168
SERVERLIBS      =       @SERVERLIBS@
157
169
SSLFLAGS        =       @SSLFLAGS@
158
170
SSLLIBS         =       @SSLLIBS@
159
171
TEXTTOPS        =       @TEXTTOPS@
207
219
mandir          =       @mandir@
208
220
oldincludedir   =       @oldincludedir@
209
221
prefix          =       @prefix@
 
222
privateinclude  =       @privateinclude@
210
223
sbindir         =       @sbindir@
211
224
sharedstatedir  =       @sharedstatedir@
212
225
srcdir          =       @srcdir@
217
230
 
218
231
AMANDIR         =       $(BUILDROOT)@AMANDIR@
219
232
BINDIR          =       $(BUILDROOT)@bindir@
 
233
BUNDLEDIR       =       @CUPS_BUNDLEDIR@
220
234
CACHEDIR        =       $(BUILDROOT)@CUPS_CACHEDIR@
221
235
DATADIR         =       $(BUILDROOT)@CUPS_DATADIR@
222
236
DOCDIR          =       $(BUILDROOT)@CUPS_DOCROOT@
230
244
MANDIR          =       $(BUILDROOT)@mandir@
231
245
MENUDIR         =       @MENUDIR@
232
246
PMANDIR         =       $(BUILDROOT)@PMANDIR@
 
247
PRIVATEINCLUDE  =       $(BUILDROOT)@PRIVATEINCLUDE@
233
248
RCLEVELS        =       @RCLEVELS@
234
249
RCSTART         =       @RCSTART@
235
250
RCSTOP          =       @RCSTOP@
289
304
 
290
305
 
291
306
#
292
 
# End of "$Id: Makedefs.in 9120 2010-04-23 18:56:34Z mike $"
 
307
# End of "$Id: Makedefs.in 9737 2011-05-04 04:28:00Z mike $"
293
308
#