Merge branch 'master' into bug504880-rra

[debian/debian-policy.git] / debian / control

diff --git a/debian/control b/debian/control
index 673eb7643ce8d24b839fa3ccef8a00ab67d00177..0c86c376e49a897dea9282ff11b0a8538b193331 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,10 @@ Vcs-Git: git://git.debian.org/git/dbnpolicy/policy.git
 Package: debian-policy
 Architecture: all
 Suggests: doc-base
-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
-    - Linux Filesystem Hierarchy Standard (FHS)
+    - Filesystem Hierarchy Standard (FHS)
     - Authoritative list of virtual package names
     - Paper about libc6 migration
     - Policy checklist for upgrading your packages