cherry pick -r 2205.1.5..2205.1.6 from debian-sid that got lost in previous merge

diff --git a/debian/control b/debian/control
index 93df24a3a1d57caa3f0869e9fc463b88eed8f602..785643bf388175eb19c8fdd650f6ee2dac13ab0e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
 Standards-Version: 3.9.3
 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  gettext:any (>= 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
+ zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
+ po4a (>= 0.34-2), autotools-dev, autoconf, automake, debiandoc-sgml
+Build-Depends-Indep: doxygen
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
 Vcs-Browser: http://code.launchpad.net/apt/ubuntu