diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
| commit | 15ccc2a685b0b884b393e356f9960e86f97f532d (patch) | |
| tree | 920a1fcf6fa2c92a05d0d1d2ccb22eb32b88522e /debian/control | |
| parent | a40c6649b99814c7d30964accdd5ecc4f1ce369a (diff) | |
| parent | 506ab3c78fb67f5e452a1748f4870af767de5ebb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index c5604bc0c..d0e89825c 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ 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), - autotools-dev, autoconf, automake + autotools-dev, autoconf, automake, libgtest-dev Build-Depends-Indep: doxygen, debiandoc-sgml, graphviz Build-Conflicts: autoconf2.13, automake1.4 Vcs-Git: git://anonscm.debian.org/apt/apt.git |