merge from mvo

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 626d9b7466319e00b9b506dca730aa0b28458848..84c411509a69513a6d3bed6304724384c424939c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,36 +1,48 @@
 Source: apt
 Section: admin
 Source: apt
 Section: admin

-Priority: standard
+Priority: important

 Maintainer: APT Development Team <deity@lists.debian.org>
 Maintainer: APT Development Team <deity@lists.debian.org>

-Standards-Version: 3.1.1
-Build-Depends: debhelper, debiandoc-sgml, libdb2-dev
+Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
+ Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
+ Luca Bruno <lethalman88@gmail.com>
+Standards-Version: 3.8.1.0
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto
+Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/

 
 Package: apt
 Architecture: any
 
 Package: apt
 Architecture: any

-Depends: ${shlibs:Depends}
-Priority: standard
+Depends: ${shlibs:Depends}, debian-archive-keyring
+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
-Section: base
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
+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
 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
 
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional

-Depends: ${libapt-pkg:provides}
-Section: devel
-Description: Development files for APT's libapt-pkg
- This package contains the header files and static libraries for
+Depends: apt (= ${binary:Version}), apt-utils (= ${binary: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
  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
 
 Package: libapt-pkg-doc
 Architecture: all


@@ -43,13 +55,23 @@ 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
  and other index files. apt-sortpkgs is a Package/Source file normalizer.
  .
  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.

+
+Package: apt-transport-https
+Architecture: any
+Depends: ${shlibs:Depends}
+Priority: optional
+Section: admin
+Description: APT https transport
+ This package contains a APT https transport. It makes it possible to
+ use 'deb https://foo distro main' lines in the sources.list.