merge patched-debian/experimental into debian/experimental

4 files changed, 102 insertions, 2 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 706a6b0..8561a5b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-4e8b7eeb3ab66c330e4ffe13535eeb348fdc5fdd
-4e8b7eeb3ab66c330e4ffe13535eeb348fdc5fdd
+82ee55983110c5975405c017fe719e232e2ce8b9
+82ee55983110c5975405c017fe719e232e2ce8b9
 e50542121e724e851fc5d6c68bb773f80c0bc12c
 e50542121e724e851fc5d6c68bb773f80c0bc12c
 gutenprint_5.3.1.orig.tar.xz
diff --git a/debian/patches/0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch b/debian/patches/0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch
new file mode 100644
index 0000000..bb801c3
--- /dev/null
+++ b/debian/patches/0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch
@@ -0,0 +1,58 @@
+From 82ee55983110c5975405c017fe719e232e2ce8b9 Mon Sep 17 00:00:00 2001
+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 00000000..42df7784
+--- /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/series b/debian/patches/series
index 75aff22..5a87222 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-backend-Fix-a-compile-warning-that-popped-up-on-Debi.patch
 0004-Need-to-increment-current_interface-as-well-as-binar.patch
 0005-Also-need-to-fix-gutenprintui2_current_interface.patch
+0006-Mirror-doc-developer-cleanwarnings.pl-from-upstream.patch
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";
+}