diff options
| author | Didier Raboud <odyx@debian.org> | 2018-12-05 22:43:49 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-12-05 22:44:11 +0100 |
| commit | f0fbb80a5bd1df3347b4baf4ff7c3b9d4cca293d (patch) | |
| tree | 7fc2be8795a293cf115d4068ce878c0cfa8b461e | |
| parent | 4a0cfa1c7722383aeaea92a83a20f0a30a7c2479 (diff) | |
| parent | df87256f3e8ebe8b945197bb43f9a20becb4cd9c (diff) | |
merge patched-debian/master into debian/master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0039-Fix-E-option-Issue-5440.patch (renamed from debian/patches/0040-Fix-E-option-Issue-5440.patch) | 2 | ||||
| -rw-r--r-- | debian/patches/manpage-translations.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index d00155af9..3b90dcee5 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -8fb32a37b3aec835801696e90d4557e1a023ebbe -8fb32a37b3aec835801696e90d4557e1a023ebbe +df87256f3e8ebe8b945197bb43f9a20becb4cd9c +df87256f3e8ebe8b945197bb43f9a20becb4cd9c 8b4e44a9626844bc5ee50279ead7b312fb263a12 8b4e44a9626844bc5ee50279ead7b312fb263a12 cups_2.2.9.orig.tar.gz diff --git a/debian/patches/0040-Fix-E-option-Issue-5440.patch b/debian/patches/0039-Fix-E-option-Issue-5440.patch index 3a5897d3e..57c46ed33 100644 --- a/debian/patches/0040-Fix-E-option-Issue-5440.patch +++ b/debian/patches/0039-Fix-E-option-Issue-5440.patch @@ -1,4 +1,4 @@ -From 8fb32a37b3aec835801696e90d4557e1a023ebbe Mon Sep 17 00:00:00 2001 +From 44c5ad66b87ad11cc8d45497034e3ada8f36f09a Mon Sep 17 00:00:00 2001 From: Michael R Sweet <michael.r.sweet@gmail.com> Date: Wed, 5 Dec 2018 13:02:09 -0500 Subject: Fix -E option (Issue #5440) diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch index c5ded5574..5d0627724 100644 --- a/debian/patches/manpage-translations.patch +++ b/debian/patches/manpage-translations.patch @@ -1,4 +1,4 @@ -From eb30fc494fc279375c45da1acf2a8eefb017e1dd Mon Sep 17 00:00:00 2001 +From df87256f3e8ebe8b945197bb43f9a20becb4cd9c Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Tue, 9 Aug 2016 18:11:50 +0200 Subject: po4a infrastructure and translations for manpages. diff --git a/debian/patches/series b/debian/patches/series index 36f10502d..cba0e2a5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -36,5 +36,5 @@ man-cups-lpd-drop-dangling-references.patch debianize_cups-config.patch 0037-Build-mantohtml-with-the-build-architecture-compiler.patch 0038-The-lp-and-lpr-commands-now-provide-better-error-mes.patch +0039-Fix-E-option-Issue-5440.patch manpage-translations.patch -0040-Fix-E-option-Issue-5440.patch |