[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, master, updated. debian/2.8.15-9-6-g8afaf2a

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 59ec8f791ab9b01320e226112f3f07251cbfc5d5
Author: Jan Dittberner <jandd at debian.org>
Date:   Wed Mar 3 11:52:22 2010 +0100

    remove patches applied upstream

diff --git a/debian/changelog b/debian/changelog
index 3d2440c..a6722f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ cracklib2 (2.8.16-1) UNRELEASED; urgency=low
 
   * use LC_COLLATE=C for speedup dictionary sorts (Closes: #569081)
   * new Upstream release
+  * remove debian/patches/03-packer-dont-print-skipping-line.patch,
+    debian/patches/svn-r152-python-use-translations.patch and
+    debian/patches/series. All patches have been applied upstream
 
  -- Jan Dittberner <jandd at debian.org>  Wed, 03 Mar 2010 11:44:33 +0100
 
diff --git a/debian/patches/03-packer-dont-print-skipping-line.patch b/debian/patches/03-packer-dont-print-skipping-line.patch
deleted file mode 100644
index 69741e1..0000000
--- a/debian/patches/03-packer-dont-print-skipping-line.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Martin Pitt <mpitt at debian.org>
-Subject: remove unnecessary output of skipped lines
-Bug-Debian: http://bugs.debian.org/304583
-Last-Update: 2009-11-18
---- a/util/packer.c
-+++ b/util/packer.c
-@@ -57,7 +57,6 @@
- 
- 	if (!buffer[0])
- 	{
--	    fprintf(stderr, "skipping line: %u\n", readed);
- 	    continue;
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e16c1b1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-03-packer-dont-print-skipping-line.patch
-svn-r152-python-use-translations.patch
diff --git a/debian/patches/svn-r152-python-use-translations.patch b/debian/patches/svn-r152-python-use-translations.patch
deleted file mode 100644
index 93ad17a..0000000
--- a/debian/patches/svn-r152-python-use-translations.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Jan Dittberner <jan at dittberner.info>
-Description: use translations in Python extension
- .
- * python/_cracklibmodule.c:
-  - add calls to gettext functions to use cracklib's translations
-Bug-Debian: http://bugs.debian.org/557390
---- a/python/_cracklibmodule.c
-+++ b/python/_cracklibmodule.c
-@@ -32,6 +32,7 @@
- #include <pthread.h>
- #endif
- #include <crack.h>
-+#include <locale.h>
- 
- #ifdef HAVE_PTHREAD_H
- static pthread_mutex_t cracklib_mutex = PTHREAD_MUTEX_INITIALIZER;
-@@ -131,6 +132,9 @@ _cracklib_FascistCheck(PyObject *self, PyObject *args, PyObject *kwargs)
-         free(dictfile);
-     }
- 
-+       setlocale(LC_ALL, "");
-+       textdomain("cracklib");
-+
-     LOCK();
-     result = FascistCheck(candidate, dict ? dict : defaultdict);
-     UNLOCK();
-

-- 
Git repository for pkg-cracklib