Further cleanup of patch to avoid accidental regeneration of docs

1 files changed, 54 insertions, 53 deletions

diff --git a/debian/patches-applied/PAM-manpage-section b/debian/patches-applied/PAM-manpage-section
index 6db70c52..4a367527 100644
--- a/debian/patches-applied/PAM-manpage-section
+++ b/debian/patches-applied/PAM-manpage-section
@@ -1617,19 +1617,6 @@ Index: pam/modules/pam_env/pam_env.8
  .\" -----------------------------------------------------------------
  .\" * Define some portability stuff
  .\" -----------------------------------------------------------------
-Index: pam/modules/pam_pwhistory/pam_pwhistory.8
-===================================================================
---- pam.orig/modules/pam_pwhistory/pam_pwhistory.8
-+++ pam/modules/pam_pwhistory/pam_pwhistory.8
-@@ -156,7 +156,7 @@
- .PP
- \fBpam.conf\fR(5),
- \fBpam.d\fR(5),
--\fBpam\fR(8)\fBpam_get_authtok\fR(3)
-+\fBpam\fR(7)\fBpam_get_authtok\fR(3)
- .SH "AUTHOR"
- .PP
- pam_pwhistory was written by Thorsten Kukuk <kukuk@thkukuk\&.de>
 Index: pam/modules/pam_pwhistory/pam_pwhistory.8.xml
 ===================================================================
 --- pam.orig/modules/pam_pwhistory/pam_pwhistory.8.xml
@@ -1643,19 +1630,20 @@ Index: pam/modules/pam_pwhistory/pam_pwhistory.8.xml
        </citerefentry>
        <citerefentry>
  	<refentrytitle>pam_get_authtok</refentrytitle><manvolnum>3</manvolnum>
-Index: pam/modules/pam_sepermit/sepermit.conf.5
+Index: pam/modules/pam_pwhistory/pam_pwhistory.8
 ===================================================================
---- pam.orig/modules/pam_sepermit/sepermit.conf.5
-+++ pam/modules/pam_sepermit/sepermit.conf.5
-@@ -110,7 +110,7 @@
+--- pam.orig/modules/pam_pwhistory/pam_pwhistory.8
++++ pam/modules/pam_pwhistory/pam_pwhistory.8
+@@ -156,7 +156,8 @@
  .PP
- \fBpam_sepermit\fR(8),
+ \fBpam.conf\fR(5),
  \fBpam.d\fR(5),
--\fBpam\fR(8),
-+\fBpam\fR(7),
- \fBselinux\fR(8),
+-\fBpam\fR(8)\fBpam_get_authtok\fR(3)
++\fBpam\fR(7)
++\fBpam_get_authtok\fR(3)
  .SH "AUTHOR"
  .PP
+ pam_pwhistory was written by Thorsten Kukuk <kukuk@thkukuk\&.de>
 Index: pam/modules/pam_sepermit/sepermit.conf.5.xml
 ===================================================================
 --- pam.orig/modules/pam_sepermit/sepermit.conf.5.xml
@@ -1669,19 +1657,19 @@ Index: pam/modules/pam_sepermit/sepermit.conf.5.xml
        <citerefentry><refentrytitle>selinux</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      </para>
    </refsect1>
-Index: pam/modules/pam_tally2/pam_tally2.8
+Index: pam/modules/pam_sepermit/sepermit.conf.5
 ===================================================================
---- pam.orig/modules/pam_tally2/pam_tally2.8
-+++ pam/modules/pam_tally2/pam_tally2.8
-@@ -236,7 +236,7 @@
+--- pam.orig/modules/pam_sepermit/sepermit.conf.5
++++ pam/modules/pam_sepermit/sepermit.conf.5
+@@ -110,7 +110,7 @@
  .PP
- \fBpam.conf\fR(5),
+ \fBpam_sepermit\fR(8),
  \fBpam.d\fR(5),
--\fBpam\fR(8)
-+\fBpam\fR(7)
+-\fBpam\fR(8),
++\fBpam\fR(7),
+ \fBselinux\fR(8),
  .SH "AUTHOR"
  .PP
- pam_tally2 was written by Tim Baverstock and Tomas Mraz\&.
 Index: pam/modules/pam_tally2/pam_tally2.8.xml
 ===================================================================
 --- pam.orig/modules/pam_tally2/pam_tally2.8.xml
@@ -1695,19 +1683,19 @@ Index: pam/modules/pam_tally2/pam_tally2.8.xml
        </citerefentry>
      </para>
    </refsect1>
-Index: pam/modules/pam_timestamp/pam_timestamp.8
+Index: pam/modules/pam_tally2/pam_tally2.8
 ===================================================================
---- pam.orig/modules/pam_timestamp/pam_timestamp.8
-+++ pam/modules/pam_timestamp/pam_timestamp.8
-@@ -124,7 +124,7 @@
- \fBpam_timestamp_check\fR(8),
+--- pam.orig/modules/pam_tally2/pam_tally2.8
++++ pam/modules/pam_tally2/pam_tally2.8
+@@ -236,7 +236,7 @@
+ .PP
  \fBpam.conf\fR(5),
  \fBpam.d\fR(5),
 -\fBpam\fR(8)
 +\fBpam\fR(7)
  .SH "AUTHOR"
  .PP
- pam_timestamp was written by Nalin Dahyabhai\&.
+ pam_tally2 was written by Tim Baverstock and Tomas Mraz\&.
 Index: pam/modules/pam_timestamp/pam_timestamp.8.xml
 ===================================================================
 --- pam.orig/modules/pam_timestamp/pam_timestamp.8.xml
@@ -1721,11 +1709,11 @@ Index: pam/modules/pam_timestamp/pam_timestamp.8.xml
        </citerefentry>
      </para>
    </refsect1>
-Index: pam/modules/pam_timestamp/pam_timestamp_check.8
+Index: pam/modules/pam_timestamp/pam_timestamp.8
 ===================================================================
---- pam.orig/modules/pam_timestamp/pam_timestamp_check.8
-+++ pam/modules/pam_timestamp/pam_timestamp_check.8
-@@ -127,7 +127,7 @@
+--- pam.orig/modules/pam_timestamp/pam_timestamp.8
++++ pam/modules/pam_timestamp/pam_timestamp.8
+@@ -124,7 +124,7 @@
  \fBpam_timestamp_check\fR(8),
  \fBpam.conf\fR(5),
  \fBpam.d\fR(5),
@@ -1733,7 +1721,7 @@ Index: pam/modules/pam_timestamp/pam_timestamp_check.8
 +\fBpam\fR(7)
  .SH "AUTHOR"
  .PP
- pam_tally was written by Nalin Dahyabhai\&.
+ pam_timestamp was written by Nalin Dahyabhai\&.
 Index: pam/modules/pam_timestamp/pam_timestamp_check.8.xml
 ===================================================================
 --- pam.orig/modules/pam_timestamp/pam_timestamp_check.8.xml
@@ -1747,6 +1735,19 @@ Index: pam/modules/pam_timestamp/pam_timestamp_check.8.xml
        </citerefentry>
      </para>
    </refsect1>
+Index: pam/modules/pam_timestamp/pam_timestamp_check.8
+===================================================================
+--- pam.orig/modules/pam_timestamp/pam_timestamp_check.8
++++ pam/modules/pam_timestamp/pam_timestamp_check.8
+@@ -127,7 +127,7 @@
+ \fBpam_timestamp_check\fR(8),
+ \fBpam.conf\fR(5),
+ \fBpam.d\fR(5),
+-\fBpam\fR(8)
++\fBpam\fR(7)
+ .SH "AUTHOR"
+ .PP
+ pam_tally was written by Nalin Dahyabhai\&.
 Index: pam/modules/pam_tty_audit/pam_tty_audit.8.xml
 ===================================================================
 --- pam.orig/modules/pam_tty_audit/pam_tty_audit.8.xml
@@ -1773,19 +1774,6 @@ Index: pam/modules/pam_tty_audit/pam_tty_audit.8
  .SH "AUTHOR"
  .PP
  pam_tty_audit was written by Miloslav Trmač <mitr@redhat\&.com>\&. The log_passwd option was added by Richard Guy Briggs <rgb@redhat\&.com>\&.
-Index: pam/doc/man/pam_get_authtok.3
-===================================================================
---- pam.orig/doc/man/pam_get_authtok.3
-+++ pam/doc/man/pam_get_authtok.3
-@@ -161,7 +161,7 @@
- .RE
- .SH "SEE ALSO"
- .PP
--\fBpam\fR(8)
-+\fBpam\fR(7)
- .SH "STANDARDS"
- .PP
- The
 Index: pam/doc/man/pam_get_authtok.3.xml
 ===================================================================
 --- pam.orig/doc/man/pam_get_authtok.3.xml
@@ -1799,3 +1787,16 @@ Index: pam/doc/man/pam_get_authtok.3.xml
        </citerefentry>
      </para>
    </refsect1>
+Index: pam/doc/man/pam_get_authtok.3
+===================================================================
+--- pam.orig/doc/man/pam_get_authtok.3
++++ pam/doc/man/pam_get_authtok.3
+@@ -161,7 +161,7 @@
+ .RE
+ .SH "SEE ALSO"
+ .PP
+-\fBpam\fR(8)
++\fBpam\fR(7)
+ .SH "STANDARDS"
+ .PP
+ The