Policy should now conflict with and replace packaging-manual

Author: jdg
Date: 2001/02/25 01:12:55
Policy should now conflict with and replace packaging-manual

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-88

diff --git a/debian/changelog b/debian/changelog
index 1b944fa4fb57888050b3a02f0a2735f93cafc085..7b3aa29b60948bdc1c00447b067090693179ad81 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debian-policy (3.5.2.1) unstable; urgency=low
 
   * Removed recommendation on packaging-manual      closes: Bug#86507
+  * Also now Conflicts and Replaces packaging-manual
 
  --
 

diff --git a/debian/control b/debian/control
index ad951b45777457a7e03fcb63ac5a9d557f1c08c2..f878a4e3a29751d8af26c09439a89b33d6e62852 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Package: debian-policy
 Architecture: all
 Suggests: doc-base
 Depends: fileutils (>= 4.0)
-Conflicts: dpkg-dev (<< 1.4.0.9), doc-base (<< 0.6)
+Conflicts: dpkg-dev (<< 1.4.0.9), doc-base (<< 0.6), packaging-manual
+Replaces: packaging-manual
 Description: Debian Policy Manual and related documents
  This package contains:
     - Debian Policy Manual