diff options
| author | Didier Raboud <odyx@debian.org> | 2018-12-10 09:35:56 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-12-10 09:36:17 +0100 |
| commit | f94b26f8e5baef4fedd4c8631d44d3303d530f0c (patch) | |
| tree | bd1a12cfd1bb45bbda76933b5dca8c8fba6b8181 /debian | |
| parent | 0f420db8b13a86e317bd7618500aca23263a3e51 (diff) | |
| parent | bb99601bd973a0189e7129311379bc8c9da6fd8c (diff) | |
merge patched-debian/experimental into debian/experimental
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 2 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 03d1a5e66..9f457f0b0 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -dadbae12448a8c85bb8181f88349f6e7bfd6862f -dadbae12448a8c85bb8181f88349f6e7bfd6862f +bb99601bd973a0189e7129311379bc8c9da6fd8c +bb99601bd973a0189e7129311379bc8c9da6fd8c c13e2f44eb15bcdbff9126df86d1ed9a5108e47c c13e2f44eb15bcdbff9126df86d1ed9a5108e47c cups_2.3~b6.orig.tar.gz diff --git a/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch b/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch new file mode 100644 index 000000000..e593f5da0 --- /dev/null +++ b/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch @@ -0,0 +1,23 @@ +From bb99601bd973a0189e7129311379bc8c9da6fd8c Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Mon, 10 Dec 2018 09:32:14 +0100 +Subject: Fix usage(int) usage for cupsd --help + +Bug: https://github.com/apple/cups/issues/5453 +--- + scheduler/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scheduler/main.c b/scheduler/main.c +index ce7df89c0..5b00efae2 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -155,7 +155,7 @@ main(int argc, /* I - Number of command-line args */ + for (i = 1; i < argc; i ++) + { + if (!strcmp(argv[i], "--help")) +- usage(); ++ usage(0); + else if (argv[i][0] == '-') + { + for (opt = argv[i] + 1; *opt != '\0'; opt ++) diff --git a/debian/patches/series b/debian/patches/series index 557f1b10b..d0e803e43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,3 +36,4 @@ man-cups-lpd-drop-dangling-references.patch debianize_cups-config.patch 0037-Build-mantohtml-with-the-build-architecture-compiler.patch manpage-translations.patch +0039-Fix-usage-int-usage-for-cupsd-help.patch |