diff options
| author | Andreas Metzler <ametzler@bebt.de> | 2014-04-12 14:42:57 +0200 |
|---|---|---|
| committer | Andreas Metzler <ametzler@bebt.de> | 2014-04-12 14:42:57 +0200 |
| commit | f4ab367c666952422fac2cab0bf6f5790daae4e9 (patch) | |
| tree | 093032930f4ebab144a9dd13ee1ad00369fc3b23 | |
| parent | 741bdecec7efeaca47bf505185dd55adb4fb2aaa (diff) | |
| parent | 6a56948c0f4f81664084d913dc5c2853f5877c42 (diff) | |
| download | exim4-f4ab367c666952422fac2cab0bf6f5790daae4e9.tar.gz | |
Merge branch 'experimental'
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2a4798f..6829deb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,18 @@ exim4 (4.82-7) unstable; urgency=high -- Andreas Metzler <ametzler@debian.org> Sun, 06 Apr 2014 08:32:11 +0200 +exim4 (4.82-6) experimental; urgency=medium + + [ Martin Pitt ] + * debian/tests/control: Add missing python test dependency, as + debian/tests/security calls python. Closes: #740092 + + [ Andreas Metzler ] + * Now that GMP has been relicensed to LGPLv3+/GPLv2+ build exim against + GnuTLS v3. + + -- Andreas Metzler <ametzler@debian.org> Sat, 05 Apr 2014 14:18:11 +0200 + exim4 (4.82-5) unstable; urgency=medium * Upgrade to libdb5.3-dev. Closes: #738637 Be paranoid and bump BDBVERSION diff --git a/debian/control b/debian/control index 9fd2007..14d1130 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.15), po-debconf, docbook-xsl, xsltproc, lynx-cur | lynx, docbook-xml, libpcre3-dev, libldap2-dev, libpam0g-dev, libident-dev, libdb5.3-dev, libxmu-dev, libxt-dev, libxext-dev, libx11-dev, libxaw7-dev, libpq-dev, libmysqlclient-dev | libmysqlclient15-dev, - libsqlite3-dev, libperl-dev, libgnutls-dev, libsasl2-dev + libsqlite3-dev, libperl-dev, libgnutls28-dev, libsasl2-dev XS-Testsuite: autopkgtest Package: exim4-base |