Sync with upstream

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

diff --git a/debian/control b/debian/control
index 0a5125fe389cd99edf87b7e03ccc7b303fb8aa30..4c1902232d475ee9e8ff99c145a4ea73a32a067d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,21 @@ Source: debian-policy
 Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
-Standards-Version: ${debian-policy:Version}
+Uploaders: Manoj Srivastava <srivasta@debian.org>, Russ Allbery <rra@debian.org>
+Standards-Version: 3.7.3
+Build-Depends-Indep: sgml-data (>= 2.0), debiandoc-sgml (>= 1.1.47), tetex-extra, groff, bsdmainutils, pstoedit, jade, docbook-xml (>= 3.1.1), docbook-dsssl, tidy, links (>= 0.90) | elinks
 
 Package: debian-policy
 Architecture: all
 Suggests: doc-base
-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
-    - Linux Filesystem Structure (FSSTND)
+    - Linux Filesystem Hierarchy Standard (FHS)
     - Authoritative list of virtual package names
     - Paper about libc6 migration
     - Policy checklist for upgrading your packages
+ It also replaces the old Packaging Manual; most of the still-relevant
+ content is now included as appendices to the Policy Manual.