diff options
6 files changed, 7 insertions, 307 deletions
diff --git a/debian/patches/0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch b/debian/patches/0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch deleted file mode 100644 index d43824c..0000000 --- a/debian/patches/0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Didier Raboud <odyx@debian.org> -Date: Sun, 4 May 2014 12:34:59 +0200 -Subject: Tests: Don't run weavetest, - testdither nor rastertogutenprint that are too long - ---- - src/cups/Makefile.am | 2 +- - test/Makefile.am | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am -index 1812d55..99e5673 100644 ---- a/src/cups/Makefile.am -+++ b/src/cups/Makefile.am -@@ -100,7 +100,7 @@ endif - AM_TESTS_ENVIRONMENT=$(STP_ENV) - test-rastertogutenprint: min-pagesize - test-rastertogutenprint.test: test-rastertogutenprint --TESTS= test-ppds.test test-rastertogutenprint.test -+TESTS= test-ppds.test - test-rastertogutenprint.log: test-ppds.log - - noinst_SCRIPTS=test-ppds.test \ -diff --git a/test/Makefile.am b/test/Makefile.am -index e98b88c..56dd57f 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -28,9 +28,7 @@ LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS) - ## It is essentially a giant unit test for the weave code. - ## testdither doesn't actually test anything; there appears to be no way - ## for it to actually return anything. --TESTS = test-curve.test run-weavetest.test run-testdither.test --run-testdither.log: run-weavetest.log --test-curve.log: run-testdither.log -+TESTS = test-curve.test - - ## Programs - diff --git a/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch b/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch deleted file mode 100644 index 3600e2f..0000000 --- a/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Didier Raboud <odyx@debian.org> -Date: Sat, 1 Dec 2018 01:39:17 +0100 -Subject: Mirror doc/developer/cleanwarnings.pl from upstream - -Taken from upstream's master; it is needed to rebuild the doc PDFs from source ---- - doc/developer/cleanwarnings.pl | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - create mode 100644 doc/developer/cleanwarnings.pl - -diff --git a/doc/developer/cleanwarnings.pl b/doc/developer/cleanwarnings.pl -new file mode 100644 -index 0000000..42df778 ---- /dev/null -+++ b/doc/developer/cleanwarnings.pl -@@ -0,0 +1,41 @@ -+# -*- Mode: Perl -*- -+## Copyright (C) 2013 Robert Krawitz -+## -+## This program is free software; you can redistribute it and/or modify -+## it under the terms of the GNU General Public License as published by -+## the Free Software Foundation; either version 2, or (at your option) -+## any later version. -+## -+## This program is distributed in the hope that it will be useful, -+## but WITHOUT ANY WARRANTY; without even the implied warranty of -+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+## GNU General Public License for more details. -+## -+## You should have received a copy of the GNU General Public License -+## along with this program. If not, see <https://www.gnu.org/licenses/>. -+ -+# Remove annoying TeX warnings from db2pdf. -+ -+$nc=""; -+while (<>) { -+ next if /^$/; -+ chomp; -+ LINE: -+ if (/^Overfull \\hbox|^LaTeX Font Warning:|^LaTeX Warning: Reference.*undefined on input line|^Package hyperref Warning:/) { -+ $nc=" "; -+ $_=<>; -+ $_=<>; -+ while (<>) { -+ if (! /^ *$/) { -+ chomp; -+ goto LINE; -+ } -+ } -+ } else { -+ print "${nc}$_"; -+ $nc="\n"; -+ } -+} -+if ($nc ne "") { -+ print "\n"; -+} diff --git a/debian/patches/0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch b/debian/patches/0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch deleted file mode 100644 index 3261982..0000000 --- a/debian/patches/0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch +++ /dev/null @@ -1,180 +0,0 @@ -From: Didier Raboud <odyx@debian.org> -Date: Sun, 4 May 2014 12:34:59 +0200 -Subject: Tests: try to run tests with custom verbose log driver - -This avoids timing out on slow architectures - -Closes: #868743 ---- - scripts/global.mk | 4 ++ - scripts/test-driver-verbose | 146 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 150 insertions(+) - create mode 100644 scripts/test-driver-verbose - -diff --git a/scripts/global.mk b/scripts/global.mk -index c405482..3c55e55 100644 ---- a/scripts/global.mk -+++ b/scripts/global.mk -@@ -8,6 +8,10 @@ - - AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) - -+# Use a verbose script to avoid timing out -+LOG_DRIVER = $(top_srcdir)/scripts/test-driver-verbose -+ -+ - LIBS = $(INTLLIBS) @LIBS@ - - # Libraries -diff --git a/scripts/test-driver-verbose b/scripts/test-driver-verbose -new file mode 100644 -index 0000000..f26644f ---- /dev/null -+++ b/scripts/test-driver-verbose -@@ -0,0 +1,146 @@ -+#! /bin/sh -+# test-driver - testsuite driver script inherited from Automake's basic, but with verbose output. -+# Verbosity patch by Didier Raboud <odyx@debian.org> -+ -+scriptversion=2018-03-07.03; # UTC -+ -+# Copyright (C) 2011-2018 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <https://www.gnu.org/licenses/>. -+ -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# Make unconditional expansion of undefined variables an error. This -+# helps a lot in preventing typo-related bugs. -+set -u -+ -+usage_error () -+{ -+ echo "$0: $*" >&2 -+ print_usage >&2 -+ exit 2 -+} -+ -+print_usage () -+{ -+ cat <<END -+Usage: -+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH -+ [--expect-failure={yes|no}] [--color-tests={yes|no}] -+ [--enable-hard-errors={yes|no}] [--] -+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] -+The '--test-name', '--log-file' and '--trs-file' options are mandatory. -+END -+} -+ -+test_name= # Used for reporting. -+log_file= # Where to save the output of the test script. -+trs_file= # Where to save the metadata of the test run. -+expect_failure=no -+color_tests=no -+enable_hard_errors=yes -+while test $# -gt 0; do -+ case $1 in -+ --help) print_usage; exit $?;; -+ --version) echo "test-driver $scriptversion"; exit $?;; -+ --test-name) test_name=$2; shift;; -+ --log-file) log_file=$2; shift;; -+ --trs-file) trs_file=$2; shift;; -+ --color-tests) color_tests=$2; shift;; -+ --expect-failure) expect_failure=$2; shift;; -+ --enable-hard-errors) enable_hard_errors=$2; shift;; -+ --) shift; break;; -+ -*) usage_error "invalid option: '$1'";; -+ *) break;; -+ esac -+ shift -+done -+ -+missing_opts= -+test x"$test_name" = x && missing_opts="$missing_opts --test-name" -+test x"$log_file" = x && missing_opts="$missing_opts --log-file" -+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" -+if test x"$missing_opts" != x; then -+ usage_error "the following mandatory options are missing:$missing_opts" -+fi -+ -+if test $# -eq 0; then -+ usage_error "missing argument" -+fi -+ -+if test $color_tests = yes; then -+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. -+ red='[0;31m' # Red. -+ grn='[0;32m' # Green. -+ lgn='[1;32m' # Light green. -+ blu='[1;34m' # Blue. -+ mgn='[0;35m' # Magenta. -+ std='[m' # No color. -+else -+ red= grn= lgn= blu= mgn= std= -+fi -+ -+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' -+trap "st=129; $do_exit" 1 -+trap "st=130; $do_exit" 2 -+trap "st=141; $do_exit" 13 -+trap "st=143; $do_exit" 15 -+ -+# Test script is run here. -+# OdyX: Make it verbose by using tee -+"$@" 2>&1 | tee -a $log_file -+estatus=$? -+ -+if test $enable_hard_errors = no && test $estatus -eq 99; then -+ tweaked_estatus=1 -+else -+ tweaked_estatus=$estatus -+fi -+ -+case $tweaked_estatus:$expect_failure in -+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; -+ 0:*) col=$grn res=PASS recheck=no gcopy=no;; -+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; -+ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; -+ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; -+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; -+esac -+ -+# Report the test outcome and exit status in the logs, so that one can -+# know whether the test passed or failed simply by looking at the '.log' -+# file, without the need of also peaking into the corresponding '.trs' -+# file (automake bug#11814). -+echo "$res $test_name (exit status: $estatus)" >>$log_file -+ -+# Report outcome to console. -+echo "${col}${res}${std}: $test_name" -+ -+# Register the test result, and other relevant metadata. -+echo ":test-result: $res" > $trs_file -+echo ":global-test-result: $res" >> $trs_file -+echo ":recheck: $recheck" >> $trs_file -+echo ":copy-in-global-log: $gcopy" >> $trs_file -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'before-save-hook 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-time-zone: "UTC0" -+# time-stamp-end: "; # UTC" -+# End: diff --git a/debian/patches/0004-Fix-selpyh-for-selphy-typo-for-Canon-CP300.patch b/debian/patches/0004-Fix-selpyh-for-selphy-typo-for-Canon-CP300.patch deleted file mode 100644 index 393fa71..0000000 --- a/debian/patches/0004-Fix-selpyh-for-selphy-typo-for-Canon-CP300.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: "Andreas B. Mundt" <andi@debian.org> -Date: Mon, 4 Nov 2019 18:40:58 +0100 -Subject: Fix 'selpyh' for 'selphy' typo for Canon CP300 - -Closes: #943964 ---- - src/cups/backend_canonselphy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cups/backend_canonselphy.c b/src/cups/backend_canonselphy.c -index 978df0d..3ef0c31 100644 ---- a/src/cups/backend_canonselphy.c -+++ b/src/cups/backend_canonselphy.c -@@ -1165,7 +1165,7 @@ struct dyesub_backend canonselphy_backend = { - { USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL, "canon-cp100"}, - { USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL, "canon-cp200"}, - { USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL, "canon-cp220"}, -- { USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selpyhcp300"}, -+ { USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selphycp300"}, - { USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, NULL, "canon-cp330"}, - { USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL, "canon-cp400"}, - { USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL, "canon-cp500"}, diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 55babc6..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch -0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch -0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch -0004-Fix-selpyh-for-selphy-typo-for-Canon-CP300.patch diff --git a/src/xml/printers/escp2.xml b/src/xml/printers/escp2.xml index 28716a4..79f5a70 100644 --- a/src/xml/printers/escp2.xml +++ b/src/xml/printers/escp2.xml @@ -189,7 +189,7 @@ <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="92" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="118" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office B1100" driver="escp2-of-b1100" manufacturer="Epson" model="99" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" /> @@ -197,17 +197,18 @@ <printer translate="name" name="Epson Stylus Office T1100" driver="escp2-of-t1100" manufacturer="Epson" model="99" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office T1110" driver="escp2-of-t1110" manufacturer="Epson" model="99" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="92" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office BX305F" driver="escp2-of-bx305f" manufacturer="Epson" model="94" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="118" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="118" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="92" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="118" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office BX630FW" driver="escp2-of-bx630fw" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="92" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="118" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office SX620FW" driver="escp2-of-sx620fw" manufacturer="Epson" model="92" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" /> - <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="92" parameters="standard_params" /> + <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="118" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" /> <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" /> |