Merge with mainline

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 6e9366a18284018cd65d81ece37ec4dfb8b2d44e..6d9418a46b541d2b46c6f42478557037f3d467a3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,66 @@
 Source: apt
 Section: admin
-Priority: optional
+Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
-Standards-Version: 2.4.1
+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.1
+Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12)
+Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: deity
-Replaces: deity
+Priority: important
+Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
+Provides: ${libapt-pkg:provides}
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
+Section: base
 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/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
-Depends: ${shlibs:Depends}
-Description: Development files for APT's libapt-pkg
- This package contains the header files and static libraries for
+Priority: optional
+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
- library.
+ library and the libapt-inst deb/tar/ar library.
 
 Package: libapt-pkg-doc
 Architecture: all
+Priority: optional
+Section: doc
 Description: Documentation for APT development
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
+
+Package: apt-utils
+Architecture: any
+Depends: ${shlibs:Depends}
+Priority: important
+Provides: ${libapt-inst:provides}
+Replaces: apt (<< 0.5.9)
+Section: admin
+Description: APT utility programs
+ 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
+ and other index files. apt-sortpkgs is a Package/Source file normalizer.