[Pkg-cracklib-commits] [pkg-cracklib] 04/05: Merge branch 'master' into experimental

[Jan Dittberner]

This is an automated email from the git hooks/post-receive script.

jandd pushed a commit to branch experimental
in repository pkg-cracklib.

commit 4ef497f5d006fa105b21c33b29a8fdc161d40db2
Merge: d2fc2fd c5ed43f
Author: Jan Dittberner <jandd at debian.org>
Date:   Sat Dec 8 12:33:07 2012 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |   11 +-
 debian/libcrack2.symbols                           |    1 +
 .../libcrack2-error-safer-check-variant.patch      |  189 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 4 files changed, 201 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 97932bd,c2839f0..6ee6105
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
- cracklib2 (2.8.19-2) experimental; urgency=low
++cracklib2 (2.8.19-2+exp1) experimental; urgency=low
 +
 +  * Build with python 3.3
 +  * rename python/_cracklibmodule.c to python/_cracklib.c and use
 +    debian/patches/rename-python-c-module.patch to change
 +    python/Makefile.am and python/setup.py.in (Closes: #681749)
 +
 + -- Jan Dittberner <jandd at debian.org>  Mon, 16 Jul 2012 10:09:33 +0200
 +
+ cracklib2 (2.8.19-2) unstable; urgency=low
+ 
+   * add debian/patches/libcrack2-error-safer-check-variant.patch to provide
+     __DEBIAN_SPECIFIC__SafeFascistCheck that does not call exit (Closes:
+     #682735)
+   * add __DEBIAN_SPECIFIC__SafeFascistCheck to debian/libcrack2.symbols
+ 
+  -- Jan Dittberner <jandd at debian.org>  Tue, 02 Oct 2012 09:15:16 +0200
+ 
  cracklib2 (2.8.19-1) unstable; urgency=low
  
    * New upstream version
diff --cc debian/patches/series
index 8f5b179,cd64245..4c4d5f3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,3 +1,4 @@@
  install-debian-python-modules.patch
  pass-dict-to-cracklib-test.patch
+ libcrack2-error-safer-check-variant.patch
 +rename-python-c-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cracklib/pkg-cracklib.git