~ubuntu-branches/ubuntu/utopic/cups/utopic

« back to all changes in this revision

Viewing changes to debian/patches/tests-use-cupsfilters.patch

  • Committer: Package Import Robot
  • Author(s): Didier Raboud, Till Kamppeter, Steve Langasek, Didier Raboud
  • Date: 2014-01-03 18:42:39 UTC
  • mfrom: (99.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20140103184239-85wju2l7weie4dgo
Tags: 1.7.0-1
* New 1.7.0 upstream release

[ Till Kamppeter ]
* Refresh most patches with quilt
* Removed usb-backend-do-not-crash-if-usb-disabled-in-bios and
  cupsd-no-crash-on-avahi-threaded-poll-shutdown patches as they got
  applied upstream
* Removed drop-arch-specifics-from-doc patch as it is not needed
  anymore
* Updated drop_unnecessary_dependencies, manpage-hyphen-minus,
  manpage-translations and ppd-poll-with-client-conf patches manually
  to apply to the new CUPS version
* Added error counting exception from
  usb-backend-do-not-crash-if-usb-disabled-in-bios to
  tests-ignore-warnings
* Install the newly added ippfind utility and its manpage in
  cups-client
* Added pwg.h to libcups2-dev package
* Call dh_auto_clean only if the file Makedefs is present, to avoid a
  FTBFS
* Added color management extensions from Joe Simon's GSoC 2013
  project.
* Patch cups-files.conf to activate CUPS daemon syncing of files when
  closing, so that config files (like printers.conf) do not
  mysteriously disappear (LP: #1157972)
* In the AppArmor profile, allow execution of programs in
  /etc/cups/interfaces/, needed to make CUPS working with queues based
  on System V interface scripts, especially PPD-less queues
  auto-generated by cups-browsed from cups-filters 1.0.41 on.
* Silenced AppArmor noise from udev.conf in syslog (LP: #1229766)

[ Steve Langasek ]
* Add cups-filters (>= 1.0.42) as alternative to foomatic-filters
  (which is deprecated) in package relationships

[ Didier Raboud ]
* Remove Roger Leigh from uploaders on his request with thanks for his
  past work!
* Switch avahi LSB Should-Start dependency to be avahi-daemon; also
  bump package relationship to >= 0.6.31-3~ (Closes: #731608)
* Refresh the manpage translation files
* Move the USB backend quirk rules file to cups-server-common
* Add 38 new 1.7.0 libcups2 symbols
* Mark one C++ libcupsppdc1 symbol as optional as it isn't exported in
  1.7.0 anymore
* Import Fedora patches:
  - to avoid sign-extending CRCs in gz decompression
  - to build with full read-only relocations
  - to fix job history logging (upstream patch)
  - to set the internal default for SyncOnClose to Yes, instead of
    only configuring it to Yes
  - to fix a stringpool corruption issue
  - to prevent USB timeouts causing incorrect print output
* Import Fedora patch updates:
  - to dont-use-dbus-from-two-threads patch so it removes a call to
    avahi_threaded_poll_stop()
  - to avoid_stale_lockfile_in_dbus_notifier patch to call _exit when
    handling SIGTERM
* Move manpage-translations patch at the very end of the patch series
  to have it include all our patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
        ln -s /usr/lib/cups/filter/imagetops /tmp/cups-$user/bin/filter
27
27
        ln -s /usr/lib/cups/filter/imagetoraster /tmp/cups-$user/bin/filter
28
28
        ln -s /usr/lib/cups/filter/pdftops /tmp/cups-$user/bin/filter
29
 
@@ -378,6 +371,35 @@
 
29
@@ -378,6 +371,37 @@
30
30
                ln -s /usr/share/cups/data/psglyphs $root/data
31
31
        fi
32
32
        ln -s /usr/share/cups/fonts /tmp/cups-$user/share
33
33
+
34
34
+       #
35
 
+       # cups-filters 1.0.25
 
35
+       # cups-filters 1.0.38
36
36
+       #
37
37
+       ln -s /usr/share/cups/mime/cupsfilters.types /tmp/cups-$user/share/mime
38
 
+       ln -s /usr/share/cups/mime/cupsfilters.convs /tmp/cups-$user/share/mime
 
38
+       # Use cups-filter's patched 1.0.38 that doesn't make the test-suite fail
 
39
+       ln -s $root/conf/cupsfilters.convs /tmp/cups-$user/share/mime
39
40
+
40
41
+       ln -s /usr/lib/cups/filter/bannertopdf /tmp/cups-$user/bin/filter
41
42
+       ln -s /usr/lib/cups/filter/commandtoescpx /tmp/cups-$user/bin/filter
42
43
+       ln -s /usr/lib/cups/filter/commandtopclx /tmp/cups-$user/bin/filter
 
44
+       ln -s /usr/lib/cups/filter/gstopxl /tmp/cups-$user/bin/filter
43
45
+       ln -s /usr/lib/cups/filter/gstoraster /tmp/cups-$user/bin/filter
44
46
+       ln -s /usr/lib/cups/filter/imagetopdf /tmp/cups-$user/bin/filter
45
47
+       ln -s /usr/lib/cups/filter/pdftoijs /tmp/cups-$user/bin/filter
62
64
 fi
63
65
 
64
66
 #
65
 
@@ -502,6 +524,8 @@
 
67
@@ -502,6 +526,8 @@
66
68
 if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then
67
69
        LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD"
68
70
 fi
71
73
 export LD_PRELOAD
72
74
 
73
75
 if test "x$DYLD_LIBRARY_PATH" = x; then
 
76
--- /dev/null
 
77
+++ b/conf/cupsfilters.convs
 
78
@@ -0,0 +1,128 @@
 
79
+#
 
80
+# "$Id: $"
 
81
+#
 
82
+#   MIME conversions file for OpenPrinting CUPS Filters.
 
83
+#
 
84
+#   Copyright 2007-2011 by Apple Inc.
 
85
+#   Copyright 1997-2007 by Easy Software Products.
 
86
+#
 
87
+#   These coded instructions, statements, and computer programs are the
 
88
+#   property of Apple Inc. and are protected by Federal copyright
 
89
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
 
90
+#   which should have been included with this file.  If this file is
 
91
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 
92
+#
 
93
+
 
94
+########################################################################
 
95
+#
 
96
+# Format of Lines:
 
97
+#
 
98
+#   source/type destination/type cost filter
 
99
+#
 
100
+# General Notes:
 
101
+#
 
102
+#   The "cost" field is used to find the least costly filters to run
 
103
+#   when converting a job file to a printable format.
 
104
+#
 
105
+#   All filters *must* accept the standard command-line arguments
 
106
+#   (job-id, user, title, copies, options, [filename or stdin]) to
 
107
+#   work with CUPS.
 
108
+#
 
109
+
 
110
+########################################################################
 
111
+#
 
112
+# PDF filters
 
113
+#
 
114
+
 
115
+# CUPS file conversion rules for PostScript input when we are working with
 
116
+# the PDF printing workflow. General PostScript input should be converted to
 
117
+# PDF, so that pdftopdf is doing the page management on PDF data and the
 
118
+# renderer/driver part renders PDF. An exception is made for PostScript
 
119
+# coming from the Adobe Reader. As this PostScript cannot be converted to PDF
 
120
+# if it comes from an encrypted PDF file, we simply override pstopdf and the
 
121
+# PDF workflow.
 
122
+
 
123
+application/postscript application/pdf                         0       pstopdf
 
124
+application/vnd.adobe-reader-postscript        application/vnd.cups-postscript 66      pstops
 
125
+
 
126
+# Original:
 
127
+# application/pdf              application/vnd.cups-pdf                66      pdftopdf
 
128
+# Patched:
 
129
+application/pdf                application/vnd.cups-pdf                22      pdftopdf
 
130
+
 
131
+application/x-cshell   application/pdf                         32      texttopdf
 
132
+application/x-csource  application/pdf                         32      texttopdf
 
133
+application/x-perl     application/pdf                         32      texttopdf
 
134
+application/x-shell    application/pdf                         32      texttopdf
 
135
+text/plain             application/pdf                         32      texttopdf
 
136
+text/html              application/pdf                         32      texttopdf
 
137
+image/gif              application/vnd.cups-pdf                65      imagetopdf
 
138
+image/png              application/vnd.cups-pdf                65      imagetopdf
 
139
+image/jpeg             application/vnd.cups-pdf                65      imagetopdf
 
140
+image/tiff             application/vnd.cups-pdf                65      imagetopdf
 
141
+image/x-bitmap         application/vnd.cups-pdf                65      imagetopdf
 
142
+image/x-photocd                application/vnd.cups-pdf                65      imagetopdf
 
143
+image/x-portable-anymap        application/vnd.cups-pdf                65      imagetopdf
 
144
+image/x-portable-bitmap        application/vnd.cups-pdf                65      imagetopdf
 
145
+image/x-portable-graymap application/vnd.cups-pdf              65      imagetopdf
 
146
+image/x-portable-pixmap        application/vnd.cups-pdf                65      imagetopdf
 
147
+image/x-sgi-rgb                application/vnd.cups-pdf                65      imagetopdf
 
148
+image/x-xbitmap                application/vnd.cups-pdf                65      imagetopdf
 
149
+image/x-xpixmap                application/vnd.cups-pdf                65      imagetopdf
 
150
+image/x-xwindowdump    application/vnd.cups-pdf                65      imagetopdf
 
151
+image/x-sun-raster     application/vnd.cups-pdf                65      imagetopdf
 
152
+application/vnd.cups-pdf-banner        application/pdf                 32      bannertopdf
 
153
+image/urf              application/pdf                         0       urftopdf
 
154
+
 
155
+########################################################################
 
156
+#
 
157
+# PostScript filters
 
158
+#
 
159
+
 
160
+#application/pdf               application/vnd.cups-postscript 66      pdftops
 
161
+
 
162
+# Original:
 
163
+# application/vnd.cups-pdf     application/vnd.cups-postscript 100     pdftops
 
164
+# Patched:
 
165
+application/vnd.cups-pdf       application/vnd.cups-postscript 22      pdftops
 
166
+
 
167
+#application/postscript                application/vnd.cups-postscript 66      pstops
 
168
+
 
169
+########################################################################
 
170
+#
 
171
+# Raster filters...
 
172
+#
 
173
+
 
174
+application/vnd.cups-pdf       application/vnd.cups-raster     99      gstoraster
 
175
+application/vnd.cups-postscript        application/vnd.cups-raster     200     gstoraster
 
176
+application/vnd.cups-pdf       application/vnd.cups-raster     100     pdftoraster
 
177
+image/gif                      application/vnd.cups-raster     100     imagetoraster
 
178
+image/png                      application/vnd.cups-raster     100     imagetoraster
 
179
+image/jpeg                     application/vnd.cups-raster     100     imagetoraster
 
180
+image/tiff                     application/vnd.cups-raster     100     imagetoraster
 
181
+image/x-bitmap                 application/vnd.cups-raster     100     imagetoraster
 
182
+image/x-photocd                        application/vnd.cups-raster     100     imagetoraster
 
183
+image/x-portable-anymap                application/vnd.cups-raster     100     imagetoraster
 
184
+image/x-portable-bitmap                application/vnd.cups-raster     100     imagetoraster
 
185
+image/x-portable-graymap       application/vnd.cups-raster     100     imagetoraster
 
186
+image/x-portable-pixmap                application/vnd.cups-raster     100     imagetoraster
 
187
+image/x-sgi-rgb                        application/vnd.cups-raster     100     imagetoraster
 
188
+image/x-xbitmap                        application/vnd.cups-raster     100     imagetoraster
 
189
+image/x-xpixmap                        application/vnd.cups-raster     100     imagetoraster
 
190
+image/x-sun-raster             application/vnd.cups-raster     100     imagetoraster
 
191
+
 
192
+########################################################################
 
193
+#
 
194
+# Text filters (only for text-only printers)...
 
195
+#
 
196
+
 
197
+application/x-cshell           text/plain                      100     -
 
198
+application/x-csource          text/plain                      100     -
 
199
+application/x-perl             text/plain                      100     -
 
200
+application/x-shell            text/plain                      100     -
 
201
+text/html                      text/plain                      100     -
 
202
+text/css                       text/plain                      100     -
 
203
+
 
204
+#
 
205
+# End of "$Id: $".
 
206
+#