diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
commit | 6c1f5d2c3c8df164e78dda8f24d28667634403e1 (patch) | |
tree | d711a52cf5a92a13b87f248307f5521846a7dbcf /debian/control | |
parent | aa2218b25cb29e8c0677f0f3ede098583c7ae49f (diff) | |
parent | 0baf849d81814fce59d86eecccbe624c8aaf0456 (diff) |
merged from David, uncommited the previous i18n commit first as its part of the merge from David already but for some reason bzr is confused and gives a gazillion of conflicts in doc/po/de.po without the uncommit first
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control index fc9d3f405..56de07a03 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,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 (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), - zlib1g-dev, libbz2-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 +Build-Depends-Indep: debiandoc-sgml, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ |