From 5cbe7aab1e49318dc4c561eee1e387653304409e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 24 Feb 2022 09:43:51 +0100 Subject: New d/p/0115-Fix_text_filter.patch --- debian/patches/0115-Fix_text_filter.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/0115-Fix_text_filter.patch (limited to 'debian/patches') diff --git a/debian/patches/0115-Fix_text_filter.patch b/debian/patches/0115-Fix_text_filter.patch new file mode 100644 index 0000000..652aa1b --- /dev/null +++ b/debian/patches/0115-Fix_text_filter.patch @@ -0,0 +1,16 @@ +Index: trunk/fileconverter.c +=================================================================== +--- trunk.orig/fileconverter.c ++++ trunk/fileconverter.c +@@ -37,9 +37,9 @@ + * is not set. (Except if the spooler is CUPS, then 'texttops' is used + */ + const char *fileconverters[][2] = { +- { "a2ps", "a2ps -1 @@--medium=@@PAGESIZE@@ @@--center-title=@@JOBTITLE@@ -o -" }, ++ { "a2ps", "a2ps -1 @@--medium=@@PAGESIZE@@ @@--center-title=\"@@JOBTITLE@@ -o -" }, + { "enscript", "enscript -G @@-M @@PAGESIZE@@ @@-b \"Page $%|@@JOBTITLE@@ --margins=36:36:36:36 --mark-wrapped-lines=arrow --word-wrap -p-" }, +- { "mpage", "mpage -o -1 @@-b @@PAGESIZE@@ @@-H -h @@JOBTITLE@@ -m36l36b36t36r -f -P- -" }, ++ { "mpage", "mpage -o -1 @@-b @@PAGESIZE@@ @@-H -h \"@@JOBTITLE@@ -m36l36b36t36r -f -P- -" }, + { "paps", "paps @@--paper @@PAGESIZE@@ --header --font=11.5" }, + { NULL, NULL } + }; diff --git a/debian/patches/series b/debian/patches/series index e6a186b..abbd0fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0110-fixed-segfault-when-creating-logfile.patch 0001-paps.patch 0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch +0115-Fix_text_filter.patch -- cgit v1.2.3 From bf03eee236924f68b1ff16a1a31e04f82e247ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 24 Feb 2022 12:46:16 +0100 Subject: New d/p/0120-Disable_option_docs.patch --- debian/patches/0120-Disable_option_docs.patch | 28 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 debian/patches/0120-Disable_option_docs.patch (limited to 'debian/patches') diff --git a/debian/patches/0120-Disable_option_docs.patch b/debian/patches/0120-Disable_option_docs.patch new file mode 100644 index 0000000..6fc85a7 --- /dev/null +++ b/debian/patches/0120-Disable_option_docs.patch @@ -0,0 +1,28 @@ +Index: trunk/foomaticrip.c +=================================================================== +--- trunk.orig/foomaticrip.c ++++ trunk/foomaticrip.c +@@ -330,8 +330,9 @@ void process_cmdline_options() + + /* "docs" option to print help page */ + if (!strcasecmp(key, "docs")) { +- do_docs = 1; +- continue; ++ do_docs = 0; ++ rip_die(EXIT_OPTION_NOT_AVAILABLE, "Option \"docs\" isn't available now.\n"); ++/* continue; */ + } + /* "profile" option to supply a color correction profile to a CUPS raster driver */ + if (!strcmp(key, "profile")) { +Index: trunk/foomaticrip.h +=================================================================== +--- trunk.orig/foomaticrip.h ++++ trunk/foomaticrip.h +@@ -62,6 +62,7 @@ + #define EXIT_PRNERR_NORETRY_BAD_SETTINGS 9 /* interface settings are invalid */ + #define EXIT_PRNERR_NO_SUCH_ADDRESS 10 /* address lookup failed, may be transient */ + #define EXIT_PRNERR_NORETRY_NO_SUCH_ADDRESS 11 /* address lookup failed, not transient */ ++#define EXIT_OPTION_NOT_AVAILABLE 20 /* Otion isn't avalable now */ + #define EXIT_INCAPABLE 50 /* printer wants (lacks) features or resources */ + + diff --git a/debian/patches/series b/debian/patches/series index abbd0fe..7ede85b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0001-paps.patch 0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch 0115-Fix_text_filter.patch +0120-Disable_option_docs.patch -- cgit v1.2.3 From 19edb7f8abe844f9eb1bcac31f15f0f27e65c25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 24 Feb 2022 13:17:33 +0100 Subject: Add DEP-3 headers --- debian/patches/0115-Fix_text_filter.patch | 9 +++++++++ debian/patches/0120-Disable_option_docs.patch | 7 +++++++ 2 files changed, 16 insertions(+) (limited to 'debian/patches') diff --git a/debian/patches/0115-Fix_text_filter.patch b/debian/patches/0115-Fix_text_filter.patch index 652aa1b..b9727fc 100644 --- a/debian/patches/0115-Fix_text_filter.patch +++ b/debian/patches/0115-Fix_text_filter.patch @@ -1,3 +1,12 @@ +Description: Fix error on handling text filter +Author: Alexander Zangerl +Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776315 +Bug: https://bugs.linuxfoundation.org/show_bug.cgi?id=1283 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776315 +Forwarded: no +Last-Update: 2022-02-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/fileconverter.c =================================================================== --- trunk.orig/fileconverter.c diff --git a/debian/patches/0120-Disable_option_docs.patch b/debian/patches/0120-Disable_option_docs.patch index 6fc85a7..8471aff 100644 --- a/debian/patches/0120-Disable_option_docs.patch +++ b/debian/patches/0120-Disable_option_docs.patch @@ -1,3 +1,10 @@ +Description: Disable not available option docs +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004417 +Forwarded: no +Last-Update: 2022-02-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/foomaticrip.c =================================================================== --- trunk.orig/foomaticrip.c -- cgit v1.2.3 From fb1799c6d1cec4c80ba4fbb7abf2af3404cc75c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 24 Feb 2022 14:01:33 +0100 Subject: New d/ppd-doc-extractor; refresh d/copyright --- debian/patches/0120-Disable_option_docs.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/patches') diff --git a/debian/patches/0120-Disable_option_docs.patch b/debian/patches/0120-Disable_option_docs.patch index 8471aff..62060f9 100644 --- a/debian/patches/0120-Disable_option_docs.patch +++ b/debian/patches/0120-Disable_option_docs.patch @@ -1,7 +1,7 @@ Description: Disable not available option docs Author: Jörg Frings-Fürst Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004417 -Forwarded: no +Forwarded: not-needed Last-Update: 2022-02-24 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -- cgit v1.2.3