Synchronized with patch 197 from Manojs tree

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

diff --git a/debian/control b/debian/control
index 36853102ece085e0bc83f540b21484d14617cc23..4c184c0a50b13cfa9392f601b9fc47d25888fb16 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: debian-policy
 Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
-Standards-Version: ${debian-policy:Version}
-Build-Depends-Indep: lynx, debiandoc-sgml, sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit
+Uploaders: Julian Gilbey <jdg@debian.org>, Manoj Srivastava <srivasta@debian.org>
+Standards-Version: 3.5.9
+Build-Depends-Indep: links (>= 0.90) | links-ssl (>= 0.90), debiandoc-sgml (>= 1.1.47), sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml (>= 3.1.1), docbook-utils
 
 Package: debian-policy
 Architecture: all
-Recommends: packaging-manual
 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
@@ -18,17 +18,5 @@ Description: Debian Policy Manual and related documents
     - Authoritative list of virtual package names
     - Paper about libc6 migration
     - Policy checklist for upgrading your packages
-
-Package: packaging-manual
-Architecture: all
-Depends: fileutils (>= 4.0)
-Recommends: debian-policy
-Suggests: doc-base, dpkg (>= 1.4.0.23)
-Description: Debian Packaging Manual
- This package installs the Debian Packaging Manual. 
- .
- This manual describes the technical aspects of creating Debian binary
- and source packages.  It also documents the interface between
- dselect and its access method scripts.  It does not deal with
- the Debian Project policy requirements, and it assumes familiarity
- with dpkg's functions from the system administrator's perspective.
+ It also replaces the old Packaging Manual; most of the still-relevant
+ content is now included as appendices to the Policy Manual.