merge keyrings with cat instead of gpg in apt-key

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index 4a73239f7fed5425b16253180df0f7e9d8d16a52..7e2db7373b34af02884e61d522ce41cb38464b3e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,27 @@ 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.5

 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
 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, xsltproc, docbook-xsl, docbook-xml,
- po4a (>= 0.34-2), autotools-dev, autoconf, automake
-Build-Depends-Indep: doxygen, debiandoc-sgml
+ 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-wheezy/
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/
+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}, gpgv | gpgv2, 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, xz-utils, python-apt
+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
 Description: commandline package manager
  This package provides commandline tools for searching and
  managing as well as querying information about packages


@@ -36,14 +38,14 @@ Description: 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.12
+Package: libapt-pkg4.15

 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Breaks: apt (<< 0.9.4~)
+Breaks: apt (<< 1.1~exp4), 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.


@@ -59,7 +61,7 @@ Description: 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.5
+Package: libapt-inst1.6

 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}


@@ -106,10 +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}

-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.


@@ -120,6 +121,7 @@ Description: package managment related utility programs
 Package: apt-transport-https
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: apt-transport-https
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

+Recommends: ca-certificates

 Priority: optional
 Description: https download transport for APT
  This package enables the usage of 'deb https://foo distro main' lines
 Priority: optional
 Description: https download transport for APT
  This package enables the usage of 'deb https://foo distro main' lines