From d8b8d0bbf70e3b08fda39f4088f277ed8013e5b8 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Don't run the insanely long test-rastertogutenprint build-test that lets sbuild timeout on all architectures Gbp-Pq: Name 0001-Don-t-run-the-insanely-long-test-rastertogutenprint.patch --- src/cups/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am index 2f70701..90a9453 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.check: test-rastertogutenprint -TESTS= test-ppds test-rastertogutenprint.check +TESTS= test-ppds noinst_SCRIPTS=test-ppds \ test-rastertogutenprint \ test-rastertogutenprint.check \ -- cgit v1.2.3 From cf5f431a886c657a12116ee540340e6500385580 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Tue, 25 Sep 2018 13:48:47 -0400 Subject: Fix format warning Gbp-Pq: Name 0002-Fix-format-warning.patch --- configure.ac | 2 +- src/cups/gutenprint.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0ae13ba..b7c5497 100644 --- a/configure.ac +++ b/configure.ac @@ -710,7 +710,7 @@ AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"]) dnl Compiler flags if test x$ac_compiler_gnu = "xyes"; then - STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072],, [GNUCFLAGS]) + STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 -Wformat -Werror=format-security -Wmissing-prototypes],, [GNUCFLAGS]) if test x${USE_MAINTAINER_MODE} = xyes ; then STP_ADD_COMPILER_ARGS([-D_POSIX_C_SOURCE=200809L -std=c99 -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS]) fi diff --git a/src/cups/gutenprint.c b/src/cups/gutenprint.c index 6ab2194..56b5599 100644 --- a/src/cups/gutenprint.c +++ b/src/cups/gutenprint.c @@ -122,7 +122,7 @@ cat_ppd(const char *uri) /* I - Driver URI */ const char *lang = NULL; char *s; char filename[1024], /* Filename */ - ppd_location[1024]; /* Installed location */ + ppd_location[2048]; /* Installed location */ const char *infix = ""; ppd_type_t ppd_type = PPD_STANDARD; gpfile outFD; -- cgit v1.2.3 From 0ae94c222f866da7b418a0f886d36a1921eefdb8 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 28 Sep 2018 11:03:53 -0400 Subject: backend: Fix a compile warning that popped up on Debian 9 Gbp-Pq: Name 0003-backend-Fix-a-compile-warning-that-popped-up-on-Debi.patch --- src/cups/backend_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c index 09ea078..09406f8 100644 --- a/src/cups/backend_common.c +++ b/src/cups/backend_common.c @@ -1354,7 +1354,7 @@ void dump_markers(struct marker *markers, int marker_count, int full) ATTR("marker-colors="); for (i = 0 ; i < marker_count; i++) { - DEBUG2(markers[i].color); + DEBUG2("%s", markers[i].color); if ((i+1) < marker_count) DEBUG2(","); } -- cgit v1.2.3 From 07e80093d566f362fdfda3f60c0b0fba3e7e1332 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Fri, 28 Sep 2018 09:45:14 -0400 Subject: Need to increment current_interface as well as binary_age. Gbp-Pq: Name 0004-Need-to-increment-current_interface-as-well-as-binar.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b7c5497..be142e9 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ pushdef([GUTENPRINT_MAJOR_VERSION], [5]) pushdef([GUTENPRINT_MINOR_VERSION], [3]) pushdef([GUTENPRINT_MICRO_VERSION], [1]) pushdef([GUTENPRINT_EXTRA_VERSION], []) -pushdef([GUTENPRINT_CURRENT_INTERFACE], [9]) +pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) -- cgit v1.2.3 From 7927f7e1f792f1d85b69aba87250d940049c98e3 Mon Sep 17 00:00:00 2001 From: Robert Krawitz Date: Sun, 30 Sep 2018 10:49:11 -0400 Subject: Also need to fix gutenprintui2_current_interface. Gbp-Pq: Name 0005-Also-need-to-fix-gutenprintui2_current_interface.patch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index be142e9..c61f06e 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ pushdef([GUTENPRINT_MICRO_VERSION], [1]) pushdef([GUTENPRINT_EXTRA_VERSION], []) pushdef([GUTENPRINT_CURRENT_INTERFACE], [10]) pushdef([GUTENPRINT_BINARY_AGE], [1]) -pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [2]) +pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [3]) pushdef([GUTENPRINTUI2_BINARY_AGE], [1]) pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.GUTENPRINT_MICRO_VERSION[]GUTENPRINT_EXTRA_VERSION) -- cgit v1.2.3 From 003753f6e19329042e402bea8b3c4c746bcf9c29 Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 Gbp-Pq: Name 0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch --- 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 . + +# 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"; +} -- cgit v1.2.3 From 5352acb4056fa10d9d494880ed0f06d23fdf847c Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Run tests with custom verbose log driver This avoids timing out on slow architectures Closes: #868743 Gbp-Pq: Name 0007-Run-tests-with-custom-verbose-log-driver.patch --- scripts/global.mk | 4 ++ scripts/test-driver-verbose | 151 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 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..221fa9e --- /dev/null +++ b/scripts/test-driver-verbose @@ -0,0 +1,151 @@ +#! /bin/sh +# test-driver - testsuite driver script inherited from Automake's basic, but with verbose output. +# Verbosity patch by Didier Raboud + +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 . + +# 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 <&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: -- cgit v1.2.3 From 9d4787dce3b1a4ae219192467bcae5cf41e0a9d5 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Don't run the insanely long test-rastertogutenprint build-test that lets sbuild timeout on all architectures --- src/cups/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3 From 27648d5a44eb7ca7ab5d99224bb44e349ab609b3 Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 . + +# 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"; +} -- cgit v1.2.3 From f7210046508b1b146baad9c0a03a44c5af3c4107 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 4 May 2014 12:34:59 +0200 Subject: Run tests with custom verbose log driver This avoids timing out on slow architectures Closes: #868743 --- scripts/global.mk | 4 ++ scripts/test-driver-verbose | 151 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 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..221fa9e --- /dev/null +++ b/scripts/test-driver-verbose @@ -0,0 +1,151 @@ +#! /bin/sh +# test-driver - testsuite driver script inherited from Automake's basic, but with verbose output. +# Verbosity patch by Didier Raboud + +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 . + +# 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 <&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: -- cgit v1.2.3 From 2ae2b15a12b43931c46aa56a60c0520051b372ae Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Fri, 13 Sep 2019 18:04:50 +0200 Subject: gutenprint 5.3.3-1 Debian release --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7ec060..f5bc9b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -gutenprint (5.3.3-1) UNRELEASED; urgency=medium +gutenprint (5.3.3-1) unstable; urgency=low - * Update to new upstream version 5.3.3. + * New 5.3.3 upstream release + * Convert from gbp dbm to debrebase + * Refresh patches - -- Didier Raboud Fri, 13 Sep 2019 17:58:15 +0200 + -- Didier Raboud Fri, 13 Sep 2019 18:04:50 +0200 gutenprint (5.3.1-7) unstable; urgency=medium -- cgit v1.2.3 From a95015e4d33ca73c91230a4c8037365bae2f7618 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Fri, 13 Sep 2019 18:06:20 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...he-insanely-long-test-rastertogutenprint-.patch | 22 +++ ...-developer-cleanwarnings.pl-from-upstream.patch | 57 +++++++ ...-Run-tests-with-custom-verbose-log-driver.patch | 185 +++++++++++++++++++++ debian/patches/series | 3 + 4 files changed, 267 insertions(+) create mode 100644 debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch create mode 100644 debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch create mode 100644 debian/patches/0003-Run-tests-with-custom-verbose-log-driver.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch new file mode 100644 index 0000000..ed82898 --- /dev/null +++ b/debian/patches/0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch @@ -0,0 +1,22 @@ +From: Didier Raboud +Date: Sun, 4 May 2014 12:34:59 +0200 +Subject: Don't run the insanely long test-rastertogutenprint build-test that + lets sbuild timeout on all architectures + +--- + src/cups/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch b/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch new file mode 100644 index 0000000..3600e2f --- /dev/null +++ b/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch @@ -0,0 +1,57 @@ +From: Didier Raboud +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 . ++ ++# 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-Run-tests-with-custom-verbose-log-driver.patch b/debian/patches/0003-Run-tests-with-custom-verbose-log-driver.patch new file mode 100644 index 0000000..f97630d --- /dev/null +++ b/debian/patches/0003-Run-tests-with-custom-verbose-log-driver.patch @@ -0,0 +1,185 @@ +From: Didier Raboud +Date: Sun, 4 May 2014 12:34:59 +0200 +Subject: Run tests with custom verbose log driver + +This avoids timing out on slow architectures + +Closes: #868743 +--- + scripts/global.mk | 4 ++ + scripts/test-driver-verbose | 151 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 155 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..221fa9e +--- /dev/null ++++ b/scripts/test-driver-verbose +@@ -0,0 +1,151 @@ ++#! /bin/sh ++# test-driver - testsuite driver script inherited from Automake's basic, but with verbose output. ++# Verbosity patch by Didier Raboud ++ ++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 . ++ ++# 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 <&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/series b/debian/patches/series new file mode 100644 index 0000000..a261722 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-Don-t-run-the-insanely-long-test-rastertogutenprint-.patch +0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch +0003-Run-tests-with-custom-verbose-log-driver.patch -- cgit v1.2.3 From 2d88b12382d359082fba306ce40529e8e266127b Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sat, 14 Sep 2019 20:09:15 +0200 Subject: Re-enable building the test programs, not the testpatterns --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 01229f9..69c1b4c 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ override_dh_auto_configure: --enable-libgutenprintui2 --with-gimp2 \ --with-cups --enable-cups-level3-ppds --enable-globalized-cups-ppds \ --enable-cups-1_2-enhancements --disable-cups-ppds \ - --disable-test \ + --enable-test --disable-testpattern \ $(MAINTAINER_MODE) \ --enable-nls -- cgit v1.2.3 From c8b07fd4162d425b354b0ee01f81fa8cb30084ae Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 09:05:25 +0200 Subject: Don't try to install obsolete CUPS' README which got removed --- debian/printer-driver-gutenprint.docs | 1 - debian/rules | 6 ------ 2 files changed, 7 deletions(-) diff --git a/debian/printer-driver-gutenprint.docs b/debian/printer-driver-gutenprint.docs index 1339891..0b55f7f 100644 --- a/debian/printer-driver-gutenprint.docs +++ b/debian/printer-driver-gutenprint.docs @@ -1,3 +1,2 @@ README doc/FAQ.html -debian/README.cups diff --git a/debian/rules b/debian/rules index 69c1b4c..8eee0e9 100755 --- a/debian/rules +++ b/debian/rules @@ -31,16 +31,10 @@ override_dh_install-indep: rm -f debian/gutenprint-locales/usr/share/locale/*/*.po override_dh_installdocs: - # Let it be installed by dh_installdocs - cp src/cups/README debian/README.cups dh_installdocs -pescputil --link-doc=libgutenprint9 dh_installdocs -plibgutenprintui2-dev --link-doc=libgutenprintui2-2 dh_installdocs --remaining-packages -override_dh_clean: - - rm -f debian/README.cups - dh_clean - override_dh_install-arch: ifeq ($(DEB_BUILD_ARCH_OS),linux) dh_install -pprinter-driver-gutenprint usr/share/cups/usb -- cgit v1.2.3 From 741d69375114dddbeeae9e4a00dffdd71206114d Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 09:21:45 +0200 Subject: Drop deprecated gimp-gutenprint doc --- debian/gimp-gutenprint.docs | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/gimp-gutenprint.docs b/debian/gimp-gutenprint.docs index 7610b61..e845566 100644 --- a/debian/gimp-gutenprint.docs +++ b/debian/gimp-gutenprint.docs @@ -1,3 +1 @@ README -doc/*.html -doc/*.png -- cgit v1.2.3 From fe1e79203a3a9bf765b0ceae89863d2560cbc2ae Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 09:23:26 +0200 Subject: Refresh verbose test-driver from automake-1.16 --- scripts/test-driver-verbose | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/scripts/test-driver-verbose b/scripts/test-driver-verbose index 221fa9e..f26644f 100644 --- a/scripts/test-driver-verbose +++ b/scripts/test-driver-verbose @@ -53,26 +53,21 @@ trs_file= # Where to save the metadata of the test run. expect_failure=no color_tests=no enable_hard_errors=yes -while test $# -gt 1; do - arg=${1%=*} - val=${1#*=} - if [ $arg = $val ]; then - val=$2 - shift - fi - case $arg in +while test $# -gt 0; do + case $1 in --help) print_usage; exit $?;; --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$val;; - --log-file) log_file=$val;; - --trs-file) trs_file=$val;; - --color-tests) color_tests=$val;; - --expect-failure) expect_failure=$val;; - --enable-hard-errors) enable_hard_errors=$val;; - --) break;; + --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 - [ $arg != $val ] && shift + shift done missing_opts= -- cgit v1.2.3 From 06970607961691ec01fb01fd63b58bf60292a066 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 13:16:09 +0200 Subject: Tests: Don't run weavetest nor testdither --- test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile.am b/test/Makefile.am index e98b88c..36b3227 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -28,7 +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 +TESTS = test-curve.test run-testdither.log: run-weavetest.log test-curve.log: run-testdither.log -- cgit v1.2.3 From e0e35c42bfa223825938c6eb8ed3567b1e6eaa5a Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 | 2 +- 2 files changed, 2 insertions(+), 2 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..36b3227 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -28,7 +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 +TESTS = test-curve.test run-testdither.log: run-weavetest.log test-curve.log: run-testdither.log -- cgit v1.2.3 From 8413fd037e4f5aed0edc384be8ec9d97f4a0646a Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 . + +# 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"; +} -- cgit v1.2.3 From f800349ae3eba41ed47275cd788e9b3093fd154f Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 + +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 . + +# 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 <&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: -- cgit v1.2.3 From 45d7de6f4baa13f7cca4db326ca543510b7349aa Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 -- cgit v1.2.3 From 1ea8a95944a46556eced0848466d6848ff007655 Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 . + +# 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"; +} -- cgit v1.2.3 From 348da55869a800f1d92bcb8f67ad1cbcbf1fb7b8 Mon Sep 17 00:00:00 2001 From: Didier Raboud 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 + +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 . + +# 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 <&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: -- cgit v1.2.3 From 313bf63e93f72b9bcc8b9b81d0da6aa3d8b4ac81 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 14:11:37 +0200 Subject: Commit patch queue (exported by git-debrebase) [git-debrebase make-patches: export and commit patches] --- ...-run-weavetest-testdither-nor-rastertogut.patch | 38 +++++ ...-developer-cleanwarnings.pl-from-upstream.patch | 57 +++++++ ...o-run-tests-with-custom-verbose-log-drive.patch | 180 +++++++++++++++++++++ debian/patches/series | 3 + 4 files changed, 278 insertions(+) create mode 100644 debian/patches/0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch create mode 100644 debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch create mode 100644 debian/patches/0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch create mode 100644 debian/patches/series 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 new file mode 100644 index 0000000..d43824c --- /dev/null +++ b/debian/patches/0001-Tests-Don-t-run-weavetest-testdither-nor-rastertogut.patch @@ -0,0 +1,38 @@ +From: Didier Raboud +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 new file mode 100644 index 0000000..3600e2f --- /dev/null +++ b/debian/patches/0002-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch @@ -0,0 +1,57 @@ +From: Didier Raboud +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 . ++ ++# 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 new file mode 100644 index 0000000..3261982 --- /dev/null +++ b/debian/patches/0003-Tests-try-to-run-tests-with-custom-verbose-log-drive.patch @@ -0,0 +1,180 @@ +From: Didier Raboud +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 ++ ++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 . ++ ++# 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 <&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/series b/debian/patches/series new file mode 100644 index 0000000..6b05737 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +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 -- cgit v1.2.3 From 24c74dc88666e1a78040beec3c085e5cd0c4459c Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 15 Sep 2019 14:21:48 +0200 Subject: gutenprint 5.3.3-2 Debian release --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index f5bc9b2..40b2f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gutenprint (5.3.3-2) unstable; urgency=medium + + * Fix all-around FTBFS: + - Re-enable building the test programs, not the testpatterns + - Skip very long or redundant tests: weavetest, testdither & + rastertogutenprint + - Don't try to install obsolete CUPS' README which got removed + - Drop deprecated gimp-gutenprint doc + * Refresh verbose test-driver from automake-1.16 + + -- Didier Raboud Sun, 15 Sep 2019 14:21:48 +0200 + gutenprint (5.3.3-1) unstable; urgency=low * New 5.3.3 upstream release -- cgit v1.2.3