diff options
| author | Didier Raboud <odyx@debian.org> | 2018-03-27 19:28:14 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-03-27 19:28:15 +0200 |
| commit | 7e6d78eabd6170437c53bd7b9c58d715a191f268 (patch) | |
| tree | 26b1e5fcf1ea7ef51e431737ea5261dc55ba24be | |
| parent | be073359f2d5f2d0e1a2fdfe13c1a99914aefc40 (diff) | |
| parent | 0281f2ccec886cb2b864f64bb67b37a5f10b3589 (diff) | |
merge patched-debian/master into debian/master
| -rw-r--r-- | berkeley/lpr.c | 2 | ||||
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0039-The-lp-and-lpr-commands-now-provide-better-error-mes.patch | 20 |
3 files changed, 6 insertions, 20 deletions
diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 0081b795d..09e0bf1e5 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,7 +1,7 @@ /* * "lpr" command for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the diff --git a/debian/.git-dpm b/debian/.git-dpm index 2170b9675..5fba12dad 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -953a8a40cc368dd9406caeb91251b4c69ca7c019 -953a8a40cc368dd9406caeb91251b4c69ca7c019 +0281f2ccec886cb2b864f64bb67b37a5f10b3589 +0281f2ccec886cb2b864f64bb67b37a5f10b3589 84c97c051db7de61342461b6333a6bf31830535e 84c97c051db7de61342461b6333a6bf31830535e cups_2.2.7.orig.tar.gz diff --git a/debian/patches/0039-The-lp-and-lpr-commands-now-provide-better-error-mes.patch b/debian/patches/0039-The-lp-and-lpr-commands-now-provide-better-error-mes.patch index d54c045ed..5be34f09c 100644 --- a/debian/patches/0039-The-lp-and-lpr-commands-now-provide-better-error-mes.patch +++ b/debian/patches/0039-The-lp-and-lpr-commands-now-provide-better-error-mes.patch @@ -1,4 +1,4 @@ -From 953a8a40cc368dd9406caeb91251b4c69ca7c019 Mon Sep 17 00:00:00 2001 +From 0281f2ccec886cb2b864f64bb67b37a5f10b3589 Mon Sep 17 00:00:00 2001 From: Michael R Sweet <michaelrsweet@gmail.com> Date: Wed, 1 Nov 2017 15:45:50 -0400 Subject: =?UTF-8?q?The=20`lp`=20and=20`lpr`=20commands=20now=20provide=20b?= @@ -11,23 +11,9 @@ Subject: =?UTF-8?q?The=20`lp`=20and=20`lpr`=20commands=20now=20provide=20b?= Bug-Debian: #870463 --- - berkeley/lpr.c | 2 +- - cups/dest.c | 38 +++++++++++++++++++++++++++++++++++++- - 2 files changed, 38 insertions(+), 2 deletions(-) + cups/dest.c | 38 +++++++++++++++++++++++++++++++++++++- + 1 file changed, 37 insertions(+), 1 deletion(-) -diff --git a/berkeley/lpr.c b/berkeley/lpr.c -index 09e0bf1e5..0081b795d 100644 ---- a/berkeley/lpr.c -+++ b/berkeley/lpr.c -@@ -1,7 +1,7 @@ - /* - * "lpr" command for CUPS. - * -- * Copyright 2007-2016 by Apple Inc. -+ * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the diff --git a/cups/dest.c b/cups/dest.c index 57a8dc95c..e91917ed2 100644 --- a/cups/dest.c |