Merge with mvo

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 7059ea58deb20d84534e35b5f18ff1f57de8ab61..6d9418a46b541d2b46c6f42478557037f3d467a3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,18 @@ Source: apt
 Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 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, debiandoc-sgml, 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.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}
 
 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}
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}

-Suggests: dpkg-dev
+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.
 Section: base
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.


@@ -20,14 +21,22 @@ Description: Advanced front-end for dpkg
  simpler, safer way to install and upgrade packages.
  .
  APT features complete installation ordering, multiple source capability
  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
 
 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
 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 +53,13 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}

-Priority: optional
+Priority: important

 Provides: ${libapt-inst:provides}
 Provides: ${libapt-inst:provides}

+Replaces: apt (<< 0.5.9)

 Section: admin
 Description: APT utility programs
 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
  .
  apt-extracttemplates is used by debconf to prompt for configuration 
  questions before installation. apt-ftparchive is used to create Package