diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-12 16:11:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-12 16:11:51 +0000 |
| commit | 33e3bf199e6848d71c73c581fa83fecbeeb1903b (patch) | |
| tree | 769e40a0abea3265f329090c56b690d619a86a84 /debian/patches/05_debian_manpage_differences.diff | |
| parent | Merging upstream version 3.9.1. (diff) | |
| download | postfix-33e3bf199e6848d71c73c581fa83fecbeeb1903b.tar.xz postfix-33e3bf199e6848d71c73c581fa83fecbeeb1903b.zip | |
Merging debian version 3.9.1-4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/05_debian_manpage_differences.diff')
| -rw-r--r-- | debian/patches/05_debian_manpage_differences.diff | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/debian/patches/05_debian_manpage_differences.diff b/debian/patches/05_debian_manpage_differences.diff index a2494b8..c746dec 100644 --- a/debian/patches/05_debian_manpage_differences.diff +++ b/debian/patches/05_debian_manpage_differences.diff @@ -1,14 +1,14 @@ -From: Scott Kitterman <scott@kitterman.com> -Subject: Update postfix-files for Debian man page naming specifics +From: Michael Tokarev <mjt@tls.msk.ru> +Subject: update postfix-files for debian manpage naming Forwarded: not-needed -Index: postfix/conf/postfix-files -=================================================================== ---- postfix.orig/conf/postfix-files -+++ postfix/conf/postfix-files -@@ -167,80 +167,82 @@ $config_directory/postfix-script:f:root: - #$config_directory/postfix-script-sgid:f:root:-:755:o - #$config_directory/postfix-script-nosgid:f:root:-:755:o - $config_directory/post-install:f:root:-:755:o +Debian-Specific: yes + +Auto-generated by debian/gen-manpage-diff.sh + +--- a/conf/postfix-files ++++ b/conf/postfix-files +@@ -169,76 +169,76 @@ + #$config_directory/post-install:f:root:-:755:o -$manpage_directory/man1/mailq.1:f:root:-:644 -$manpage_directory/man1/newaliases.1:f:root:-:644 -$manpage_directory/man1/postalias.1:f:root:-:644 @@ -142,8 +142,6 @@ Index: postfix/conf/postfix-files +$manpage_directory/man8/pickup.8postfix.gz:f:root:-:644 +$manpage_directory/man8/pipe.8postfix.gz:f:root:-:644 +$manpage_directory/man8/postlogd.8postfix.gz:f:root:-:644 -+$manpage_directory/man8/postfix-add-filter.8.gz:f:root:-:644 -+$manpage_directory/man8/postfix-add-policy.8.gz:f:root:-:644 +$manpage_directory/man8/postscreen.8postfix.gz:f:root:-:644 +$manpage_directory/man8/proxymap.8postfix.gz:f:root:-:644 +$manpage_directory/man8/qmgr.8postfix.gz:f:root:-:644 @@ -160,5 +158,3 @@ Index: postfix/conf/postfix-files +$manpage_directory/man8/verify.8postfix.gz:f:root:-:644 +$manpage_directory/man8/virtual.8postfix.gz:f:root:-:644 $sample_directory/sample-aliases.cf:f:root:-:644:o - $sample_directory/sample-auth.cf:f:root:-:644:o - $sample_directory/sample-canonical.cf:f:root:-:644:o |