3 files changed, 2 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 702f892d..19aac216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,8 @@ pam (0.99.10.0-1) UNRELEASED; urgency=low
   * Drop patches 006_docs_cleanup, 015_hurd_portability,
     019_pam_listfile_quiet, 024_debian_cracklib_dict_path, 038_support_hurd,
     043_pam_unix_unknown_user_not_alert, 046_pam_group_example,
-    no_pthread_mutexes, limits_wrong_strncpy, and
-    misc_conv_allow_sigint.patch, which have been merged upstream.
+    no_pthread_mutexes, limits_wrong_strncpy, misc_conv_allow_sigint.patch,
+    and pam_tally_audit.patch, which have been merged upstream.
   * Patch 022_pam_unix_group_time_miscfixes: partially merged upstream;
     now is really just "pam_group_miscfixes".
   * Patch 007_modules_pam_unix partially superseded upstream; stripping
diff --git a/debian/patches-applied/pam_tally_audit.patch b/debian/patches-applied/pam_tally_audit.patch
deleted file mode 100644
index f7f5764b..00000000
--- a/debian/patches-applied/pam_tally_audit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to fix the definition of OPT_AUDIT to be octal instead of decimal,
-so that it works properly in a bit field.
-
-Authors: Corey Wright <undefined@pobox.com>
-
-Upstream status: not yet submitted
-
---- Linux-PAM/modules/pam_tally/pam_tally.c~	2007-10-12 01:49:15.000000000 +0000
-+++ Linux-PAM/modules/pam_tally/pam_tally.c	2007-10-12 03:26:04.000000000 +0000
-@@ -95,7 +95,7 @@ struct tally_options {
- #define OPT_PER_USER			 010
- #define	OPT_NO_LOCK_TIME		 020
- #define OPT_NO_RESET			 040
--#define OPT_AUDIT                        100
-+#define OPT_AUDIT                       0100
- 
- 
- /*---------------------------------------------------------------------*/
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index bdbd0a49..1cd60c79 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -17,5 +17,4 @@ hurd_no_setfsuid
 065_pam_unix_cracklib_disable
 PAM-manpage-section 
 pam_env_ignore_garbage.patch -p2
-pam_tally_audit.patch
 autoconf.patch