diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:43:52 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:43:52 +0200 |
| commit | 7f00ffb0d0016642e9d4969b5f052213e4599b58 (patch) | |
| tree | 78554c0a3a14a326cbb64a1528ebb288ba6b2b57 /debian | |
| parent | a450c45f7df50c240c2822ba791a6bcc93aa2a49 (diff) | |
cherry pick -r 2205.1.5..2205.1.6 from debian-sid that got lost in previous merge
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 5 |
1 files changed, 3 insertions, 2 deletions
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 <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 |