merged mvo/feature/deb822

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 0020056a860e3e8c05d375cdbe56fc56c8a80047..c70d0e9eaab2f6e862cb3505a2093229f2adad74 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,24 @@ 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: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
- Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
+Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>, 

  Julian Andres Klode <jak@debian.org>
  Julian Andres Klode <jak@debian.org>

-Standards-Version: 3.9.3
+Standards-Version: 3.9.4

 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,

- gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0),
+ gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),

  zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
  zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,

- po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml
-Build-Depends-Indep: doxygen
+ po4a (>= 0.34-2), autotools-dev, autoconf, automake
+Build-Depends-Indep: doxygen, debiandoc-sgml

 Build-Conflicts: autoconf2.13, automake1.4
 Build-Conflicts: autoconf2.13, automake1.4

-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
+Vcs-Git: git://anonscm.debian.org/apt/apt.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
+XS-Testsuite: autopkgtest

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

-Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
-Replaces: manpages-pl (<< 20060617-3~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg
+Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)
+Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~)

 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
 Description: commandline package manager
 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
 Description: commandline package manager


@@ -41,8 +42,9 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}

+Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~)

 Section: libs
 Section: libs

-Description: package managment runtime library
+Description: package management runtime library

  This library provides the common functionality for searching and
  managing packages as well as information about packages.
  Higher-level package managers can depend upon this library.
  This library provides the common functionality for searching and
  managing packages as well as information about packages.
  Higher-level package managers can depend upon this library.


@@ -106,9 +108,9 @@ Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: xz-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: xz-utils

-Description: package managment related utility programs
+Description: package management related utility programs

  This package contains some less used commandline utilities related
  This package contains some less used commandline utilities related

- to package managment with APT.
+ to package management with APT.

  .
   * apt-extracttemplates is used by debconf to prompt for configuration
     questions before installation.
  .
   * apt-extracttemplates is used by debconf to prompt for configuration
     questions before installation.