* merged from mainline

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 99da566b407d1803219d0ab62d4e38a5f25d684b..3cba50acb3b2cfda0503cce02193dd42fb49ca8c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,32 +2,42 @@ Source: apt
 Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg@debian.org>
-Standards-Version: 3.1.1
-Build-Depends: debhelper, docbook-utils, libdb2-dev
+Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
+Standards-Version: 3.6.2.2
+Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12)
+Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}
-Priority: standard
+Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
-Suggests: dpkg-dev
-Section: base
+Recommends: debian-archive-keyring
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
+Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a 
  simpler, safer way to install and upgrade packages.
  .
  APT features complete installation ordering, multiple source capability
- and several other unique features, see the Users Guide in
- /usr/share/doc/apt/guide.text.gz
+ and several other unique features, see the Users Guide in apt-doc.
+
+Package: apt-doc
+Architecture: all
+Priority: optional
+Replaces: apt (<< 0.5.4.9)
+Section: doc
+Description: Documentation for APT
+ This package contains the user guide and offline guide, for APT, an
+ Advanced Package Tool.
 
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
-Depends: apt-utils, ${libapt-pkg:provides}, ${libapt-inst:provides}
-Section: devel
+Depends: apt (= ${Source-Version}), apt-utils (= ${Source-Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}
+Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
  developing with APT's libapt-pkg Debian package manipulation
@@ -44,12 +54,13 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Priority: optional
+Priority: important
 Provides: ${libapt-inst:provides}
+Replaces: apt (<< 0.5.9)
 Section: admin
 Description: APT utility programs
- This package contains some infrequently used APT utility programs such
- as apt-ftparchive, apt-sortpkgs and apt-extracttemplates.
+ This package contains some APT utility programs such as apt-ftparchive,
+ apt-sortpkgs and apt-extracttemplates.
  .
  apt-extracttemplates is used by debconf to prompt for configuration 
  questions before installation. apt-ftparchive is used to create Package