From 2e072fb317b89ba1f93eac7df2b3da441d2b428d Mon Sep 17 00:00:00 2001
From: Steve Langasek <vorlon@debian.org>
Date: Tue, 22 Jul 2008 16:58:51 -0700
Subject: drop a dozen patches that have been merged upstream \o/

---
 debian/patches-applied/006_docs_cleanup | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 debian/patches-applied/006_docs_cleanup

(limited to 'debian/patches-applied/006_docs_cleanup')

diff --git a/debian/patches-applied/006_docs_cleanup b/debian/patches-applied/006_docs_cleanup
deleted file mode 100644
index b5dce7c6..00000000
--- a/debian/patches-applied/006_docs_cleanup
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream status: committed to CVS
-
-Index: Linux-PAM/doc/man/pam.conf-syntax.xml
-===================================================================
---- Linux-PAM/doc/man/pam.conf-syntax.xml.orig
-+++ Linux-PAM/doc/man/pam.conf-syntax.xml
-@@ -211,7 +211,8 @@
-       <emphasis>authtok_disable_aging</emphasis>,
-       <emphasis>try_again</emphasis>, <emphasis>ignore</emphasis>,
-       <emphasis>abort</emphasis>, <emphasis>authtok_expired</emphasis>,
--      <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>
-+      <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>,
-+      <emphasis>conv_again</emphasis>, <emphasis>incomplete</emphasis>,
-       and <emphasis>default</emphasis>.
-     </para>
-     <para>
-Index: Linux-PAM/doc/man/pam.conf.5
-===================================================================
---- Linux-PAM/doc/man/pam.conf.5.orig
-+++ Linux-PAM/doc/man/pam.conf.5
-@@ -175,7 +175,9 @@
- \fIabort\fR,
- \fIauthtok_expired\fR,
- \fImodule_unknown\fR,
--\fIbad_item\fR
-+\fIbad_item\fR,
-+\fIconv_again\fR,
-+\fIincomplete\fR,
- and
- \fIdefault\fR.
- .PP
-- 
cgit v1.2.3