[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, master, updated. debian/2.8.16-2-6-g1dcd391

[Jan Dittberner]

The following commit has been merged in the master branch:
commit d39fdf8b32fc9e0e0dd260c5a250d562f9a98626
Author: Jan Dittberner <jandd at debian.org>
Date:   Fri Sep 10 18:36:07 2010 +0200

    revert change to use Breaks instead of Conflicts

diff --git a/debian/changelog b/debian/changelog
index 058bfe1..6acdcbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 cracklib2 (2.8.16-3) UNRELEASED; urgency=low
 
-  * debian/control: update to Standards-Version to 3.9.1
-   - update Standards-Version field
-   - use Breaks instead of Conflicts
+  * debian/control: update to Standards-Version to 3.9.1 (no changes)
   * add debian/patches/596281-fix-python-extension-segfault.patch: in
     cracklib-python's C module, make sure we initialize defaultdict to
     NULL at the start of _cracklib_FascistCheck. This fixes a bug where
diff --git a/debian/control b/debian/control
index 7f0d674..5a5fb75 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Package: libcrack2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: cracklib-runtime
-Breaks: cracklib2.6, cracklib2 (<< 2.8.12-1)
+Conflicts: cracklib2.6, cracklib2 (<< 2.8.12-1)
 Provides: cracklib2
 Replaces: cracklib2.6, cracklib2 (<< 2.8.12-1)
 Description: pro-active password checker library
@@ -32,8 +32,8 @@ Priority: extra
 Architecture: any
 Depends: libcrack2 (=${binary:Version}), ${misc:Depends}
 Recommends: cracklib-runtime
-Breaks: cracklib-dev, cracklib2-dev (<< 2.8.12-1)
 Provides: cracklib-dev, cracklib2-dev
+Conflicts: cracklib-dev, cracklib2-dev (<< 2.8.12-1)
 Replaces: cracklib-dev, cracklib2-dev (<< 2.8.12-1)
 Description: pro-active password checker library - development files
  Header files, static libraries, documentation, and symbolic links
@@ -60,8 +60,8 @@ Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
  libcrack2 (>=${binary:Version}), cracklib-runtime
  (>=${binary:Version})
-Breaks: python-crack
 Provides: ${python:Provides}
+Conflicts: python-crack
 Replaces: python-crack
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for password checker library cracklib2

-- 
Git repository for pkg-cracklib