Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]

4 files changed, 267 insertions, 0 deletions

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 <odyx@debian.org>
+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 <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-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 <odyx@debian.org>
+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 <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 1; do
++ arg=${1%=*}
++ val=${1#*=}
++ if [ $arg = $val ]; then
++   val=$2
++   shift
++ fi
++ case $arg 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;;
++  -*) usage_error "invalid option: '$1'";;
++  esac
++  [ $arg != $val ] && 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='' # Red.
++  grn='' # Green.
++  lgn='' # Light green.
++  blu='' # Blue.
++  mgn='' # Magenta.
++  std=''     # 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/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