merge with debian-sid, update-po for manpages and fix a few more

[ntk/apt.git] / debian / control

diff --git a/debian/control b/debian/control
index bcf89da..0cf092c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,18 +5,16 @@ Maintainer: APT Development Team <deity@lists.debian.org>
 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>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.8.2.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, po4a (>= 0.34-2)
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt
 Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring
-Priority: important
-Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
+Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}
 Provides: ${libapt-pkg:provides}
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
-Section: admin
+Conflicts: python-apt (<< 0.7.93.2~)
+Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 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 
@@ -28,7 +26,7 @@ Description: Advanced front-end for dpkg
 Package: apt-doc
 Architecture: all
 Priority: optional
-Replaces: apt (<< 0.5.4.9)
+Depends: ${misc:Depends}
 Section: doc
 Description: Documentation for APT
  This package contains the user guide and offline guide, for APT, an
@@ -37,7 +35,7 @@ Description: Documentation for APT
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}
+Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}
 Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
@@ -47,6 +45,7 @@ Description: Development files for APT's libapt-pkg and libapt-inst
 Package: libapt-pkg-doc
 Architecture: all
 Priority: optional
+Depends: ${misc:Depends}
 Section: doc
 Description: Documentation for APT development
  This package contains documentation for development of the APT
@@ -54,11 +53,8 @@ Description: Documentation for APT development
 
 Package: apt-utils
 Architecture: any
-Depends: ${shlibs:Depends}
-Priority: important
+Depends: ${shlibs:Depends}, ${misc:Depends}
 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.
@@ -69,9 +65,8 @@ Description: APT utility programs
 
 Package: apt-transport-https
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc: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.