From 7f00ffb0d0016642e9d4969b5f052213e4599b58 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 May 2012 16:43:52 +0200 Subject: cherry pick -r 2205.1.5..2205.1.6 from debian-sid that got lost in previous merge --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 93df24a3a..785643bf3 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,9 @@ Uploaders: Michael Vogt , Otavio Salvador , 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 -- cgit v1.2.3