diff options
| author | Steve Langasek <vorlon@debian.org> | 2010-07-29 20:16:39 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:32:38 -0800 |
| commit | 655c7a8843261079fecf0b6e15de77972a0eb708 (patch) | |
| tree | 167aeb717538bdc9f685a652009038d586530779 /debian/patches-applied/conditional_module,_conditional_man | |
| parent | 6ce511785e4b9751ef184236c2cf8f63bc25f512 (diff) | |
| parent | 8645d4f5131d25692dfd78d3e1c46b03f33febf3 (diff) | |
| download | pam-655c7a8843261079fecf0b6e15de77972a0eb708.tar.gz pam-655c7a8843261079fecf0b6e15de77972a0eb708.tar.bz2 pam-655c7a8843261079fecf0b6e15de77972a0eb708.zip | |
merge from trunk
Diffstat (limited to 'debian/patches-applied/conditional_module,_conditional_man')
| -rw-r--r-- | debian/patches-applied/conditional_module,_conditional_man | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man new file mode 100644 index 00000000..69e15a80 --- /dev/null +++ b/debian/patches-applied/conditional_module,_conditional_man @@ -0,0 +1,26 @@ +Description: don't install manpage for pam_tty_audit if the module isn't built + If we don't have the libraries required for building pam_tty_audit, we + shouldn't install the manpage either. +Author: Steve Langasek <steve.langasek@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 +Forwarded: <20100607181348.GA28895@dario.dodds.net> +Applied-Upstream: 987, http://bzr.debian.org/pkg-pam/upstream/branches/HEAD + +Index: pam.deb/modules/pam_tty_audit/Makefile.am +=================================================================== +--- pam.deb.orig/modules/pam_tty_audit/Makefile.am ++++ pam.deb/modules/pam_tty_audit/Makefile.am +@@ -5,9 +5,11 @@ + CLEANFILES = *~ + MAINTAINERCLEANFILES = $(MANS) README + +-EXTRA_DIST = README $(MANS) $(XMLS) ++EXTRA_DIST = README pam_tty_audit.8 $(XMLS) + +-man_MANS = pam_tty_audit.8 ++if HAVE_AUDIT_TTY_STATUS ++ man_MANS = pam_tty_audit.8 ++endif + XMLS = README.xml pam_tty_audit.8.xml + + securelibdir = $(SECUREDIR) |