merge debian/sid into debian/experimental

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index d014dfdab1aa8a4c18a3a7b97a2b29ae059ee228..8c3eea3f1133e98ffb750d61f6ba15b8a79af31d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,28 @@ 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.2
-Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev,
- gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), 
- zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, 
- po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
+Standards-Version: 3.9.5
+Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
+ gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
+ zlib1g-dev, libbz2-dev, liblzma-dev,
+ xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
+ autotools-dev, autoconf, automake, libgtest-dev
+Build-Depends-Indep: doxygen, w3m, graphviz

 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 | gnupg2, adduser
+Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~)
+Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~), sun-java6-jdk (>> 0), sun-java5-jdk (>> 0), openjdk-6-jdk (<< 6b24-1.11-0ubuntu1~)

 Conflicts: python-apt (<< 0.7.93.2~)
 Conflicts: python-apt (<< 0.7.93.2~)

-Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
-Description: APT's commandline package manager
+Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt
+Description: commandline package manager

  This package provides commandline tools for searching and
  managing as well as querying information about packages
  as a low-level access to all features of the libapt-pkg library.
  This package provides commandline tools for searching and
  managing as well as querying information about packages
  as a low-level access to all features of the libapt-pkg library.


@@ -35,10 +38,14 @@ Description: APT's commandline package manager
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 

-Package: libapt-pkg4.11
+Package: libapt-pkg4.15

 Architecture: any
 Architecture: any

+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}

 Depends: ${shlibs:Depends}, ${misc:Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: APT's package managment runtime library
+Breaks: apt (<< 1.1~exp4), libapt-inst1.5 (<< 0.9.9~)
+Section: libs
+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.


@@ -54,11 +61,14 @@ Description: APT's package managment runtime library
     http, rsh as well as an interface to add more transports like
     https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
 
     http, rsh as well as an interface to add more transports like
     https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
 

-Package: libapt-inst1.3
+Package: libapt-inst1.6

 Architecture: any
 Architecture: any

+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}

 Depends: ${shlibs:Depends}, ${misc:Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: APT's deb package format runtime library
- This library provides methods to query and extract information 
+Section: libs
+Description: deb package format runtime library
+ This library provides methods to query and extract information

  from deb packages. This includes the control data and the package
  file content.
 
  from deb packages. This includes the control data and the package
  file content.
 


@@ -67,16 +77,18 @@ Architecture: all
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc

-Description: Documentation for APT
+Description: documentation for APT

  This package contains the user guide and offline guide for various
  APT tools which are provided in a html and a text-only version.
 
 Package: libapt-pkg-dev
 Architecture: any
  This package contains the user guide and offline guide for various
  APT tools which are provided in a html and a text-only version.
 
 Package: libapt-pkg-dev
 Architecture: any

+Multi-Arch: same

 Priority: optional
 Priority: optional

-Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev

 Section: libdevel
 Section: libdevel

-Description: Development files for APT's libapt-pkg and libapt-inst
+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 and the libapt-inst deb/tar/ar library.
  This package contains the header files and libraries for
  developing with APT's libapt-pkg Debian package manipulation
  library and the libapt-inst deb/tar/ar library.


@@ -86,7 +98,7 @@ Architecture: all
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc

-Description: Documentation for APT development
+Description: documentation for APT development

  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
  .
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
  .


@@ -96,9 +108,9 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Description: APT 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.


@@ -114,7 +126,7 @@ Description: https download transport for APT
  This package enables the usage of 'deb https://foo distro main' lines
  in the /etc/apt/sources.list so that all package managers using the
  libapt-pkg library can access metadata and packages available in sources
  This package enables the usage of 'deb https://foo distro main' lines
  in the /etc/apt/sources.list so that all package managers using the
  libapt-pkg library can access metadata and packages available in sources

- accessable over https (Hypertext Transfer Protocol Secure).
+ accessible over https (Hypertext Transfer Protocol Secure).

  .
  .

- This transport supports server as well as client authenification
+ This transport supports server as well as client authentication

  with certificates.
  with certificates.