Merge branch 'debian/sid' into debian/experimental

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index cb6f9b995fcc1d13d74fcec3409342b7adae241f..51bb85d30057da21d69b71496890e228acd2fcca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ 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),
  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
-Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz
+ autotools-dev, autoconf, automake, libgtest-dev
+Build-Depends-Indep: doxygen, w3m, graphviz

 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git


@@ -19,8 +19,8 @@ XS-Testsuite: autopkgtest
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg
 Package: apt
 Architecture: any
 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~)
+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~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt
 Description: commandline package manager
 Conflicts: python-apt (<< 0.7.93.2~)
 Suggests: aptitude | synaptic | wajig, dpkg-dev (>= 1.17.2), apt-doc, python-apt
 Description: commandline package manager


@@ -38,7 +38,7 @@ 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.13

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


@@ -61,7 +61,7 @@ Description: package management 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}