diff options
37 files changed, 49 insertions, 372 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 40bb4a795..bf863f877 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -393d9b6bbaeed4f18c0fa5a219edaed50f95b0c4 -393d9b6bbaeed4f18c0fa5a219edaed50f95b0c4 +b77f3435425c88fa05433dea955d3f1e22f657d3 +b77f3435425c88fa05433dea955d3f1e22f657d3 3ebcafd1ecd182879509ddc83288926177b4a615 3ebcafd1ecd182879509ddc83288926177b4a615 cups_2.2~rc1.orig.tar.gz diff --git a/debian/patches/add-ipp-backend-of-cups-1.4.patch b/debian/patches/add-ipp-backend-of-cups-1.4.patch index 91e698f97..c2688ee30 100644 --- a/debian/patches/add-ipp-backend-of-cups-1.4.patch +++ b/debian/patches/add-ipp-backend-of-cups-1.4.patch @@ -1,4 +1,4 @@ -From 775e933444bfc3b47d228bed42b0485d46954031 Mon Sep 17 00:00:00 2001 +From 56f5a444aa9456da7080067624d62451cea8eb96 Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:37 +0200 Subject: Add the IPP backend of CUPS 1.4.x to the current CUPS diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch index 97363b34a..e17aec098 100644 --- a/debian/patches/airprint-support.patch +++ b/debian/patches/airprint-support.patch @@ -1,4 +1,4 @@ -From 6997f244e6f8a8c97d8605e4eb259bd7b28ead97 Mon Sep 17 00:00:00 2001 +From ac487627f811074bb3493991ce3ee75e1191711b Mon Sep 17 00:00:00 2001 From: Till Kamppeter <till.kamppeter@gmail.com> Date: Tue, 9 Aug 2016 18:11:29 +0200 Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch index 5857dbe1f..8cadc019c 100644 --- a/debian/patches/confdirperms.patch +++ b/debian/patches/confdirperms.patch @@ -1,4 +1,4 @@ -From 41c2497f3db56e96a99365350ceb34a8439b2b40 Mon Sep 17 00:00:00 2001 +From e121596556ab6a7c38f42cfcf5ab1876a6f36439 Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:41 +0200 Subject: Do not mess with the permissions of cupsd.conf. diff --git a/debian/patches/cups-deviced-allow-device-ids-with-newline.patch b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch index cd9b319a3..b0134bfa5 100644 --- a/debian/patches/cups-deviced-allow-device-ids-with-newline.patch +++ b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch @@ -1,4 +1,4 @@ -From bff622d242242789053a32f9374b541a87925cf2 Mon Sep 17 00:00:00 2001 +From 67d9869a395d738da5f3e4aed64f5e4f108f3e54 Mon Sep 17 00:00:00 2001 From: Till Kamppeter <till.kamppeter@gmail.com> Date: Tue, 9 Aug 2016 18:11:28 +0200 Subject: Some printers have broken device IDs with newline diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch index aa146ddda..52352d129 100644 --- a/debian/patches/cups-set-default-error-policy-retry-job.patch +++ b/debian/patches/cups-set-default-error-policy-retry-job.patch @@ -1,4 +1,4 @@ -From 76384834ed17d6a9b08110cc93a66fbf9fcfb1b1 Mon Sep 17 00:00:00 2001 +From 37a892d339721f7c91ab2f670d1d8632885ab2e1 Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.pitt@ubuntu.com> Date: Tue, 9 Aug 2016 18:11:47 +0200 Subject: Set default job error policy to "retry-job", since it is less diff --git a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch b/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch index de7e51137..44b9b7fa6 100644 --- a/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch +++ b/debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch @@ -1,4 +1,4 @@ -From 4396cd73f2797fa14bd23a631bccd22bc7343c1a Mon Sep 17 00:00:00 2001 +From ec8e211c8199b8590bfb3790395fcac30a8a2254 Mon Sep 17 00:00:00 2001 From: Tim Waugh <twaugh@redhat.com> Date: Tue, 9 Aug 2016 18:11:30 +0200 Subject: Let the "snmp" backend also use the manufacturer-specific diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch index 756931200..f91e7103e 100644 --- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch +++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch @@ -1,4 +1,4 @@ -From 0edf4d769d812e3a517c2d92899f528647b1cb99 Mon Sep 17 00:00:00 2001 +From bcbb2c1d137d0339ebcb4b8dfb9103b2097decee Mon Sep 17 00:00:00 2001 From: Tim Waugh <twaugh@redhat.com> Date: Tue, 9 Aug 2016 18:11:46 +0200 Subject: Set the default for SyncOnClose to Yes diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch index 79cefbc75..4dd8d2d4d 100644 --- a/debian/patches/debianize_cups-config.patch +++ b/debian/patches/debianize_cups-config.patch @@ -1,4 +1,4 @@ -From e719a3db8602eca060f4c360a8335f3ec337093f Mon Sep 17 00:00:00 2001 +From b40b9bddb19212ceea320b40994f630659e388f6 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:49 +0200 Subject: Use dpkg-architecture in cups-config to make it diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch index 9d70da16b..12790d3dc 100644 --- a/debian/patches/default_log_settings.patch +++ b/debian/patches/default_log_settings.patch @@ -1,4 +1,4 @@ -From 0dbcfe5a48743edc5f9a50b02554b606c32bd6ff Mon Sep 17 00:00:00 2001 +From 0aabca6c3eb2a7620606d0e31fd6a1edbc7a71e1 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:40 +0200 Subject: Deactivate CUPS' own log rotating as the system already provides a diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch index 750a37bbf..6671fc9eb 100644 --- a/debian/patches/do-not-broadcast-with-hostnames.patch +++ b/debian/patches/do-not-broadcast-with-hostnames.patch @@ -1,4 +1,4 @@ -From bae559fb88331492139917a5c204fb9a8519f86c Mon Sep 17 00:00:00 2001 +From 5847e367ddd5c39feddd69d3c640ca7a1b5a3f00 Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:35 +0200 Subject: Do not use host names for broadcasting print queues and diff --git a/debian/patches/drop_unnecessary_dependencies.patch b/debian/patches/drop_unnecessary_dependencies.patch index 6e2568859..1d7461a5c 100644 --- a/debian/patches/drop_unnecessary_dependencies.patch +++ b/debian/patches/drop_unnecessary_dependencies.patch @@ -1,4 +1,4 @@ -From 09cbf52ce1d36cee1e3ca1301e529446e3ed417e Mon Sep 17 00:00:00 2001 +From 855739c0af5ad4709b673fb34476b304bc90cefd Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:25 +0200 Subject: Do not link libcups.so and libcupsimage.so against diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch index 3d4c66d70..375ebd5c5 100644 --- a/debian/patches/log-debug-history-nearly-unlimited.patch +++ b/debian/patches/log-debug-history-nearly-unlimited.patch @@ -1,4 +1,4 @@ -From cdbbbc39801ff5f4a0e38cfa7bc0950fb21e8adf Mon Sep 17 00:00:00 2001 +From a6117b7e47a6e37a01a93e4cbcd95a37eed641b0 Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:45 +0200 Subject: Make log debug history nearly unlimited diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch index 5ca775e9b..701c8ad88 100644 --- a/debian/patches/logfiles_adm_readable.patch +++ b/debian/patches/logfiles_adm_readable.patch @@ -1,4 +1,4 @@ -From 1fbe6349d45868b6ffb206f51d5445f5ead2423a Mon Sep 17 00:00:00 2001 +From e6dcc6e49d63d065c914147e976c0744f4913ef8 Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:38 +0200 Subject: Make log files readable to group "adm", if present. diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch index 82ddfc8ec..2789297b3 100644 --- a/debian/patches/man-cups-lpd-drop-dangling-references.patch +++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch @@ -1,4 +1,4 @@ -From bc361b7fdc6348e631f29355cd82cc56f129a27e Mon Sep 17 00:00:00 2001 +From 8eff54dfdd386c55eb1cbed9119c8a223197116b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr> Date: Tue, 9 Aug 2016 18:11:48 +0200 Subject: Drop dangling references from cups-lpd.man diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch index 1d5836065..6e54e56c3 100644 --- a/debian/patches/manpage-translations.patch +++ b/debian/patches/manpage-translations.patch @@ -1,4 +1,4 @@ -From 393d9b6bbaeed4f18c0fa5a219edaed50f95b0c4 Mon Sep 17 00:00:00 2001 +From b77f3435425c88fa05433dea955d3f1e22f657d3 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:50 +0200 Subject: po4a infrastructure and translations for manpages. diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch index 62e451333..742d9a4a2 100644 --- a/debian/patches/move-cupsd-conf-default-to-share.patch +++ b/debian/patches/move-cupsd-conf-default-to-share.patch @@ -1,4 +1,4 @@ -From 80e731cbbd43c6fc42743364537c4b24b50898ca Mon Sep 17 00:00:00 2001 +From 772b2bf5c119e0de4edd4e0a6840eb6cecc0aad0 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:24 +0200 Subject: Move cupsd.conf.default from SERVERROOT to DATADIR diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch index d00d38f52..99ef5df7c 100644 --- a/debian/patches/no-conffile-timestamp.patch +++ b/debian/patches/no-conffile-timestamp.patch @@ -1,4 +1,4 @@ -From 6236dee00534221a4e42fa5524624b41f4bb4248 Mon Sep 17 00:00:00 2001 +From d7c3a9271922f187512dc155387bc97955a8fdd9 Mon Sep 17 00:00:00 2001 From: Joey Hess <joeyh@debian.org> Date: Tue, 9 Aug 2016 18:11:31 +0200 Subject: Disable time stamps in conffiles, to avoid ever-changing files in diff --git a/debian/patches/pidfile.patch b/debian/patches/pidfile.patch index 29919094e..d74e3eb8e 100644 --- a/debian/patches/pidfile.patch +++ b/debian/patches/pidfile.patch @@ -1,4 +1,4 @@ -From 18a030e1b83f279ead3a5cf820fb95f2d2c9def2 Mon Sep 17 00:00:00 2001 +From 515085f639734b0022d69afb7684b6bb98cfa08a Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:32 +0200 Subject: Add support for creating pid files. @@ -126,10 +126,10 @@ index e0ab6e8..9caa47f 100644 * 'cupsdAddString()' - Copy and add a string to an array. */ diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index 73f141a..586152a 100755 +index a6e7b84..603bc50 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -542,6 +542,7 @@ FontPath $BASE/share/fonts +@@ -525,6 +525,7 @@ FontPath $BASE/share/fonts DocumentRoot $root/doc RequestRoot $BASE/spool TempDir $BASE/spool/temp diff --git a/debian/patches/ppdc-dynamic-linking.patch b/debian/patches/ppdc-dynamic-linking.patch index 2c9581283..12b11c3ab 100644 --- a/debian/patches/ppdc-dynamic-linking.patch +++ b/debian/patches/ppdc-dynamic-linking.patch @@ -1,4 +1,4 @@ -From 92e8fb623eff86cab79eda72e8cca8fd07847d65 Mon Sep 17 00:00:00 2001 +From ab3dcabf6c04e6eecf018495e2d33d3d184433fb Mon Sep 17 00:00:00 2001 From: Sune Vuorela <debian@pusling.com> Date: Tue, 9 Aug 2016 18:11:44 +0200 Subject: Dynamically link ppdc, to work around segfault on mipsen. diff --git a/debian/patches/printer-filtering.patch b/debian/patches/printer-filtering.patch index 7664cb987..1093dfe26 100644 --- a/debian/patches/printer-filtering.patch +++ b/debian/patches/printer-filtering.patch @@ -1,4 +1,4 @@ -From 2ddd3e2bec21061218ac788e8c7d8ea06257e1d9 Mon Sep 17 00:00:00 2001 +From 5739ca30bae336e045657d4a1faab3e9ff92074c Mon Sep 17 00:00:00 2001 From: Julien Desfossez at Revolution Linux <Julien Desfossez at Revolution Linux> Date: Tue, 9 Aug 2016 18:11:42 +0200 diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch index 688b9aef2..a9b3939bb 100644 --- a/debian/patches/reactivate_recommended_driver.patch +++ b/debian/patches/reactivate_recommended_driver.patch @@ -1,4 +1,4 @@ -From f7a0c2d9950f8e2822e8d508c24b433b243dc133 Mon Sep 17 00:00:00 2001 +From d1c6ef61c46145a04b452482f0fd0b2029494a21 Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:36 +0200 Subject: CUPS removes the "(recommended)" comments of the NickNames of diff --git a/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch index a2411f674..ca21d14dc 100644 --- a/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch +++ b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch @@ -1,4 +1,4 @@ -From 9b281e7fe22921adbb60a4dc720ab6fa8b24c026 Mon Sep 17 00:00:00 2001 +From 0959eb548767d6e328a7662d15f12d0db739342e Mon Sep 17 00:00:00 2001 From: Till Kamppeter <till.kamppeter@gmail.com> Date: Tue, 9 Aug 2016 18:11:27 +0200 Subject: Make CUPS reading all option settings in PostScript print diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch index df019a411..68e7a5b6e 100644 --- a/debian/patches/removecvstag.patch +++ b/debian/patches/removecvstag.patch @@ -1,4 +1,4 @@ -From 28c86b64234c60fd3030213308414dd24f8b405a Mon Sep 17 00:00:00 2001 +From ba55029a2eee8838b8756b0b7330108d2b75a7c9 Mon Sep 17 00:00:00 2001 From: Kenshi Muto <kmuto@debian.org> Date: Tue, 9 Aug 2016 18:11:33 +0200 Subject: Do not write VCS tags into installed conffiles diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch index 5649de8d4..d4f95214d 100644 --- a/debian/patches/rename-systemd-units.patch +++ b/debian/patches/rename-systemd-units.patch @@ -1,4 +1,4 @@ -From b04bdf08bc93f93493756681fb36b894b2bcd255 Mon Sep 17 00:00:00 2001 +From 95fccb764ad7258c883950eaa4efed5fa79b7695 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:34 +0200 Subject: Rename the systemd service file from org.cups.cups.* to cups.* diff --git a/debian/patches/series b/debian/patches/series index e32f119e0..691f00c73 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,7 +11,6 @@ tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.pdf test-i18n-nonlinux.patch tests-wait-on-unfinished-jobs-everytime.patch tests-fix-ppdLocalize-on-unclean-env.patch -tests-use-cupsfilters.patch tests-fix-mips-getjobs.patch tests-use-ipv4-lo-address.patch tests-make-lpstat-call-reproducible.patch diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch index 3c5aaf29a..095df92e4 100644 --- a/debian/patches/show-compile-command-lines.patch +++ b/debian/patches/show-compile-command-lines.patch @@ -1,4 +1,4 @@ -From 4bf2dbb19113ff89ab4a43205463b67b634eaa0d Mon Sep 17 00:00:00 2001 +From ac3280397a5d9c4d064e1f8c5b720f1b5f8eb52a Mon Sep 17 00:00:00 2001 From: Till Kampetter <till.kampetter@gmail.com> Date: Tue, 9 Aug 2016 18:11:43 +0200 Subject: Show compile command lines diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch index c779eed37..1521bdbf7 100644 --- a/debian/patches/test-i18n-nonlinux.patch +++ b/debian/patches/test-i18n-nonlinux.patch @@ -1,8 +1,8 @@ -From ae0da35cdbada1d995b1ea1330e66e2ad3ceed54 Mon Sep 17 00:00:00 2001 +From 7c13cbb13e1d614e09671ac8f440957dab04b34b Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:16 +0200 -Subject: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as glibc's - iconv behavior is different than what the test expects. +Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as + glibc's iconv behavior is different than what the test expects. Bug-Debian: http://bugs.debian.org/662996 diff --git a/debian/patches/tests-fix-mips-getjobs.patch b/debian/patches/tests-fix-mips-getjobs.patch index cd01515dc..09613aa5b 100644 --- a/debian/patches/tests-fix-mips-getjobs.patch +++ b/debian/patches/tests-fix-mips-getjobs.patch @@ -1,4 +1,4 @@ -From ede41c80f82691193a0f9a84276a6e0248b00e19 Mon Sep 17 00:00:00 2001 +From 467f0d10456308e5010377245480a8c0c6d7ec66 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:20 +0200 Subject: Make some attributes optional in the IPP-1.1 3.2.6 GetJobs test, diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch index a3812f4e5..6fcdfb569 100644 --- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch +++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch @@ -1,7 +1,8 @@ -From 6148d10865736f66163d430e540995665a80cc61 Mon Sep 17 00:00:00 2001 +From 3b3e398e8b1f7c1431c785adf13e2c7eb4c2a1db Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:18 +0200 -Subject: Force LC_* environment variables when testing (non) l10n'isation. +Subject: Tests: Force LC_* environment variables when testing (non) + l10n'isation. Permits building in non-"C" environments. Origin: vendor diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch index 5b4f56f1b..f0293754a 100644 --- a/debian/patches/tests-make-lpstat-call-reproducible.patch +++ b/debian/patches/tests-make-lpstat-call-reproducible.patch @@ -1,4 +1,4 @@ -From 749eac4f03e447f64c17019c5575e92193ace88e Mon Sep 17 00:00:00 2001 +From 52b524df2620df034a79e9dd2002700b62c47682 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:22 +0200 Subject: Force LC_ALL=C environment variable when grepping the output of @@ -13,10 +13,10 @@ Patch-Name: tests-make-lpstat-call-reproducible.patch 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index 4c2d704..bec6c39 100755 +index 1691028..11242c6 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -726,7 +726,7 @@ fi +@@ -709,7 +709,7 @@ fi IPP_PORT=$port; export IPP_PORT while true; do @@ -25,7 +25,7 @@ index 4c2d704..bec6c39 100755 if test "x$running" = "xscheduler is running"; then break fi -@@ -843,13 +843,13 @@ kill -HUP $cupsd +@@ -826,13 +826,13 @@ kill -HUP $cupsd while true; do sleep 10 diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch index 6d03633bb..6bc2bcfdd 100644 --- a/debian/patches/tests-no-pdftourf.patch +++ b/debian/patches/tests-no-pdftourf.patch @@ -1,4 +1,4 @@ -From daaf576425d5ff9986a5a0aaf14572aa4869c2b4 Mon Sep 17 00:00:00 2001 +From 1042814e84db3a59014dfdf30b0d25cbb8bc1be0 Mon Sep 17 00:00:00 2001 From: Michael Sweet <michael.r.sweet@gmail.com> Date: Tue, 9 Aug 2016 18:11:23 +0200 Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c @@ -18,7 +18,7 @@ Patch-Name: tests-no-pdftourf.patch delete mode 100644 test/test.types diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index bec6c39..73f141a 100755 +index 11242c6..a6e7b84 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -277,7 +277,7 @@ case "$usedebugprintfs" in diff --git a/debian/patches/tests-use-cupsfilters.patch b/debian/patches/tests-use-cupsfilters.patch deleted file mode 100644 index b3ec0ce2d..000000000 --- a/debian/patches/tests-use-cupsfilters.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 9a60ed740fea0e3d0879b06a2bf7a1a1930cfa29 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -Date: Tue, 9 Aug 2016 18:11:19 +0200 -Subject: Use cups-filter's filters, type declarations, conversions (from - 1.0.38, patched) - - and libraries. This fixes the tests that need those. -Origin: vendor -Last-Update: 2015-02-10 -Patch-Name: tests-use-cupsfilters.patch ---- - test/cupsfilters.convs | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ - test/run-stp-tests.sh | 17 +++++++ - 2 files changed, 145 insertions(+) - create mode 100644 test/cupsfilters.convs - -diff --git a/test/cupsfilters.convs b/test/cupsfilters.convs -new file mode 100644 -index 0000000..815befb ---- /dev/null -+++ b/test/cupsfilters.convs -@@ -0,0 +1,128 @@ -+# -+# "$Id: $" -+# -+# MIME conversions file for OpenPrinting CUPS Filters. -+# -+# Copyright 2007-2011 by Apple Inc. -+# Copyright 1997-2007 by Easy Software Products. -+# -+# These coded instructions, statements, and computer programs are the -+# property of Apple Inc. and are protected by Federal copyright -+# law. Distribution and use rights are outlined in the file "LICENSE.txt" -+# which should have been included with this file. If this file is -+# file is missing or damaged, see the license at "http://www.cups.org/". -+# -+ -+######################################################################## -+# -+# Format of Lines: -+# -+# source/type destination/type cost filter -+# -+# General Notes: -+# -+# The "cost" field is used to find the least costly filters to run -+# when converting a job file to a printable format. -+# -+# All filters *must* accept the standard command-line arguments -+# (job-id, user, title, copies, options, [filename or stdin]) to -+# work with CUPS. -+# -+ -+######################################################################## -+# -+# PDF filters -+# -+ -+# CUPS file conversion rules for PostScript input when we are working with -+# the PDF printing workflow. General PostScript input should be converted to -+# PDF, so that pdftopdf is doing the page management on PDF data and the -+# renderer/driver part renders PDF. An exception is made for PostScript -+# coming from the Adobe Reader. As this PostScript cannot be converted to PDF -+# if it comes from an encrypted PDF file, we simply override pstopdf and the -+# PDF workflow. -+ -+application/postscript application/pdf 0 pstopdf -+application/vnd.adobe-reader-postscript application/vnd.cups-postscript 66 pstops -+ -+# Original: -+# application/pdf application/vnd.cups-pdf 66 pdftopdf -+# Patched: -+application/pdf application/vnd.cups-pdf 22 pdftopdf -+ -+application/x-cshell application/pdf 32 texttopdf -+application/x-csource application/pdf 32 texttopdf -+application/x-perl application/pdf 32 texttopdf -+application/x-shell application/pdf 32 texttopdf -+text/plain application/pdf 32 texttopdf -+text/html application/pdf 32 texttopdf -+image/gif application/vnd.cups-pdf 65 imagetopdf -+image/png application/vnd.cups-pdf 65 imagetopdf -+image/jpeg application/vnd.cups-pdf 65 imagetopdf -+image/tiff application/vnd.cups-pdf 65 imagetopdf -+image/x-bitmap application/vnd.cups-pdf 65 imagetopdf -+image/x-photocd application/vnd.cups-pdf 65 imagetopdf -+image/x-portable-anymap application/vnd.cups-pdf 65 imagetopdf -+image/x-portable-bitmap application/vnd.cups-pdf 65 imagetopdf -+image/x-portable-graymap application/vnd.cups-pdf 65 imagetopdf -+image/x-portable-pixmap application/vnd.cups-pdf 65 imagetopdf -+image/x-sgi-rgb application/vnd.cups-pdf 65 imagetopdf -+image/x-xbitmap application/vnd.cups-pdf 65 imagetopdf -+image/x-xpixmap application/vnd.cups-pdf 65 imagetopdf -+image/x-xwindowdump application/vnd.cups-pdf 65 imagetopdf -+image/x-sun-raster application/vnd.cups-pdf 65 imagetopdf -+application/vnd.cups-pdf-banner application/pdf 32 bannertopdf -+image/urf application/pdf 0 urftopdf -+ -+######################################################################## -+# -+# PostScript filters -+# -+ -+#application/pdf application/vnd.cups-postscript 66 pdftops -+ -+# Original: -+# application/vnd.cups-pdf application/vnd.cups-postscript 100 pdftops -+# Patched: -+application/vnd.cups-pdf application/vnd.cups-postscript 22 pdftops -+ -+#application/postscript application/vnd.cups-postscript 66 pstops -+ -+######################################################################## -+# -+# Raster filters... -+# -+ -+application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster -+application/vnd.cups-postscript application/vnd.cups-raster 200 gstoraster -+application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster -+image/gif application/vnd.cups-raster 100 imagetoraster -+image/png application/vnd.cups-raster 100 imagetoraster -+image/jpeg application/vnd.cups-raster 100 imagetoraster -+image/tiff application/vnd.cups-raster 100 imagetoraster -+image/x-bitmap application/vnd.cups-raster 100 imagetoraster -+image/x-photocd application/vnd.cups-raster 100 imagetoraster -+image/x-portable-anymap application/vnd.cups-raster 100 imagetoraster -+image/x-portable-bitmap application/vnd.cups-raster 100 imagetoraster -+image/x-portable-graymap application/vnd.cups-raster 100 imagetoraster -+image/x-portable-pixmap application/vnd.cups-raster 100 imagetoraster -+image/x-sgi-rgb application/vnd.cups-raster 100 imagetoraster -+image/x-xbitmap application/vnd.cups-raster 100 imagetoraster -+image/x-xpixmap application/vnd.cups-raster 100 imagetoraster -+image/x-sun-raster application/vnd.cups-raster 100 imagetoraster -+ -+######################################################################## -+# -+# Text filters (only for text-only printers)... -+# -+ -+application/x-cshell text/plain 100 - -+application/x-csource text/plain 100 - -+application/x-perl text/plain 100 - -+application/x-shell text/plain 100 - -+text/html text/plain 100 - -+text/css text/plain 100 - -+ -+# -+# End of "$Id: $". -+# -diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index 631030b..fe560d0 100755 ---- a/test/run-stp-tests.sh -+++ b/test/run-stp-tests.sh -@@ -468,6 +468,23 @@ else - instfilter pstoraster pstoraster raster - instfilter texttopdf texttopdf pdf - -+ # cups-filters types, filters and banners -+ ln -s /usr/share/cups/mime/cupsfilters.types /tmp/cups-$user/share/mime -+ ln -s $root/test/cupsfilters.convs /tmp/cups-$user/share/mime -+ -+ instfilter gstoraster gstoraster raster -+ instfilter imagetoraster imagetoraster raster -+ instfilter pstopdf pstopdf pdf -+ instfilter urftopdf urftopdf pdf -+ instfilter bannertopdf bannertopdf pdf -+ -+ ln -sf /usr/share/cups/banners/classified /tmp/cups-$user/share/banners/ -+ ln -sf /usr/share/cups/banners/confidential /tmp/cups-$user/share/banners/ -+ ln -sf /usr/share/cups/banners/secret /tmp/cups-$user/share/banners/ -+ ln -sf /usr/share/cups/banners/standard /tmp/cups-$user/share/banners/ -+ ln -sf /usr/share/cups/banners/topsecret /tmp/cups-$user/share/banners/ -+ ln -sf /usr/share/cups/banners/unclassified /tmp/cups-$user/share/banners/ -+ - if test -d /usr/share/cups/charsets; then - ln -s /usr/share/cups/charsets $BASE/share - fi diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch index b96d4840a..36651a9b2 100644 --- a/debian/patches/tests-use-ipv4-lo-address.patch +++ b/debian/patches/tests-use-ipv4-lo-address.patch @@ -1,4 +1,4 @@ -From 311a5baa3c2c58d4a60670e4ac1c0fd63804e1c7 Mon Sep 17 00:00:00 2001 +From 622d3c1d8cdf47fedc2d2071110fff81277ac843 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:21 +0200 Subject: Use 127.0.0.1 instead of localhost in the test-suite. This should @@ -30,10 +30,10 @@ index 07f1d5a..d715f33 100644 echo " FAILED" exit 1 diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh -index fe560d0..4c2d704 100755 +index 631030b..1691028 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh -@@ -505,7 +505,7 @@ fi +@@ -488,7 +488,7 @@ fi cat >$BASE/cupsd.conf <<EOF StrictConformance Yes Browsing Off @@ -42,7 +42,7 @@ index fe560d0..4c2d704 100755 Listen $BASE/sock PassEnv DYLD_LIBRARY_PATH PassEnv LD_LIBRARY_PATH -@@ -637,7 +637,7 @@ fi +@@ -620,7 +620,7 @@ fi export SHLIB_PATH CUPS_DISABLE_APPLE_DEFAULT=yes; export CUPS_DISABLE_APPLE_DEFAULT @@ -51,7 +51,7 @@ index fe560d0..4c2d704 100755 CUPS_SERVERROOT=$BASE; export CUPS_SERVERROOT CUPS_STATEDIR=$BASE; export CUPS_STATEDIR CUPS_DATADIR=$BASE/share; export CUPS_DATADIR -@@ -770,10 +770,10 @@ for file in 4*.test ipp-2.1.test; do +@@ -753,10 +753,10 @@ for file in 4*.test ipp-2.1.test; do echo "" >>$strfile if test $file = ipp-2.1.test; then diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch index 6fd789fe4..525ec1fde 100644 --- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch +++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch @@ -1,7 +1,7 @@ -From ab4a7f4d24955c282c061aba1f5f7dc267076c2c Mon Sep 17 00:00:00 2001 +From 6ce9b313b4fed63f094a9b02007d074e0754a46d Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:17 +0200 -Subject: Make sure that all scheduled jobs are finished before +Subject: Tests: Make sure that all scheduled jobs are finished before running a new test. Fixes failures on slow architectures like armel and mipsel. diff --git a/test/cupsfilters.convs b/test/cupsfilters.convs deleted file mode 100644 index 815befb2b..000000000 --- a/test/cupsfilters.convs +++ /dev/null @@ -1,128 +0,0 @@ -# -# "$Id: $" -# -# MIME conversions file for OpenPrinting CUPS Filters. -# -# Copyright 2007-2011 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# - -######################################################################## -# -# Format of Lines: -# -# source/type destination/type cost filter -# -# General Notes: -# -# The "cost" field is used to find the least costly filters to run -# when converting a job file to a printable format. -# -# All filters *must* accept the standard command-line arguments -# (job-id, user, title, copies, options, [filename or stdin]) to -# work with CUPS. -# - -######################################################################## -# -# PDF filters -# - -# CUPS file conversion rules for PostScript input when we are working with -# the PDF printing workflow. General PostScript input should be converted to -# PDF, so that pdftopdf is doing the page management on PDF data and the -# renderer/driver part renders PDF. An exception is made for PostScript -# coming from the Adobe Reader. As this PostScript cannot be converted to PDF -# if it comes from an encrypted PDF file, we simply override pstopdf and the -# PDF workflow. - -application/postscript application/pdf 0 pstopdf -application/vnd.adobe-reader-postscript application/vnd.cups-postscript 66 pstops - -# Original: -# application/pdf application/vnd.cups-pdf 66 pdftopdf -# Patched: -application/pdf application/vnd.cups-pdf 22 pdftopdf - -application/x-cshell application/pdf 32 texttopdf -application/x-csource application/pdf 32 texttopdf -application/x-perl application/pdf 32 texttopdf -application/x-shell application/pdf 32 texttopdf -text/plain application/pdf 32 texttopdf -text/html application/pdf 32 texttopdf -image/gif application/vnd.cups-pdf 65 imagetopdf -image/png application/vnd.cups-pdf 65 imagetopdf -image/jpeg application/vnd.cups-pdf 65 imagetopdf -image/tiff application/vnd.cups-pdf 65 imagetopdf -image/x-bitmap application/vnd.cups-pdf 65 imagetopdf -image/x-photocd application/vnd.cups-pdf 65 imagetopdf -image/x-portable-anymap application/vnd.cups-pdf 65 imagetopdf -image/x-portable-bitmap application/vnd.cups-pdf 65 imagetopdf -image/x-portable-graymap application/vnd.cups-pdf 65 imagetopdf -image/x-portable-pixmap application/vnd.cups-pdf 65 imagetopdf -image/x-sgi-rgb application/vnd.cups-pdf 65 imagetopdf -image/x-xbitmap application/vnd.cups-pdf 65 imagetopdf -image/x-xpixmap application/vnd.cups-pdf 65 imagetopdf -image/x-xwindowdump application/vnd.cups-pdf 65 imagetopdf -image/x-sun-raster application/vnd.cups-pdf 65 imagetopdf -application/vnd.cups-pdf-banner application/pdf 32 bannertopdf -image/urf application/pdf 0 urftopdf - -######################################################################## -# -# PostScript filters -# - -#application/pdf application/vnd.cups-postscript 66 pdftops - -# Original: -# application/vnd.cups-pdf application/vnd.cups-postscript 100 pdftops -# Patched: -application/vnd.cups-pdf application/vnd.cups-postscript 22 pdftops - -#application/postscript application/vnd.cups-postscript 66 pstops - -######################################################################## -# -# Raster filters... -# - -application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster -application/vnd.cups-postscript application/vnd.cups-raster 200 gstoraster -application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster -image/gif application/vnd.cups-raster 100 imagetoraster -image/png application/vnd.cups-raster 100 imagetoraster -image/jpeg application/vnd.cups-raster 100 imagetoraster -image/tiff application/vnd.cups-raster 100 imagetoraster -image/x-bitmap application/vnd.cups-raster 100 imagetoraster -image/x-photocd application/vnd.cups-raster 100 imagetoraster -image/x-portable-anymap application/vnd.cups-raster 100 imagetoraster -image/x-portable-bitmap application/vnd.cups-raster 100 imagetoraster -image/x-portable-graymap application/vnd.cups-raster 100 imagetoraster -image/x-portable-pixmap application/vnd.cups-raster 100 imagetoraster -image/x-sgi-rgb application/vnd.cups-raster 100 imagetoraster -image/x-xbitmap application/vnd.cups-raster 100 imagetoraster -image/x-xpixmap application/vnd.cups-raster 100 imagetoraster -image/x-sun-raster application/vnd.cups-raster 100 imagetoraster - -######################################################################## -# -# Text filters (only for text-only printers)... -# - -application/x-cshell text/plain 100 - -application/x-csource text/plain 100 - -application/x-perl text/plain 100 - -application/x-shell text/plain 100 - -text/html text/plain 100 - -text/css text/plain 100 - - -# -# End of "$Id: $". -# diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 586152af9..603bc502e 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -466,23 +466,6 @@ else instfilter pstoraster pstoraster raster instfilter texttopdf texttopdf pdf - # cups-filters types, filters and banners - ln -s /usr/share/cups/mime/cupsfilters.types /tmp/cups-$user/share/mime - ln -s $root/test/cupsfilters.convs /tmp/cups-$user/share/mime - - instfilter gstoraster gstoraster raster - instfilter imagetoraster imagetoraster raster - instfilter pstopdf pstopdf pdf - instfilter urftopdf urftopdf pdf - instfilter bannertopdf bannertopdf pdf - - ln -sf /usr/share/cups/banners/classified /tmp/cups-$user/share/banners/ - ln -sf /usr/share/cups/banners/confidential /tmp/cups-$user/share/banners/ - ln -sf /usr/share/cups/banners/secret /tmp/cups-$user/share/banners/ - ln -sf /usr/share/cups/banners/standard /tmp/cups-$user/share/banners/ - ln -sf /usr/share/cups/banners/topsecret /tmp/cups-$user/share/banners/ - ln -sf /usr/share/cups/banners/unclassified /tmp/cups-$user/share/banners/ - if test -d /usr/share/cups/charsets; then ln -s /usr/share/cups/charsets $BASE/share fi |