[Pkg-xmpp-commits] [gsasl] 05/05: Readd automake-1.11 dependency (gsasl 1.8.0 doesn't work with later automake).

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas-guest pushed a commit to branch master
in repository gsasl.

commit e88872a3dd9c75e2787b1e3e854d6958e1c9828c
Author: Simon Josefsson <simon at josefsson.org>
Date:   Thu Oct 2 14:47:48 2014 +0200

    Readd automake-1.11 dependency (gsasl 1.8.0 doesn't work with later automake).
---
 debian/changelog | 2 +-
 debian/control   | 2 +-
 debian/rules     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cff325..1cab414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ gsasl (1.8.0-5) unstable; urgency=low
 
   * libgsasl7-dev: Depend on libkrb5-multidev.  Closes: #745332.
   * Standards-Version: 3.9.6.
-  * Drop autotools-dev (we use dh-autoreconf) and automake-1.11 hard coding.
+  * Drop autotools-dev (we use dh-autoreconf).
 
  -- Simon Josefsson <simon at josefsson.org>  Thu, 02 Oct 2014 14:17:31 +0200
 
diff --git a/debian/control b/debian/control
index b0ef176..1173cb9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian XMPP Maintainers <pkg-xmpp-devel at lists.alioth.debian.org>
 Uploaders: Thadeu Lima de Souza Cascardo <cascardo at minaslivre.org>,
  Jorge Salamero Sanz <bencer at debian.org>, Simon Josefsson <simon at josefsson.org>
-Build-Depends: cdbs, debhelper (>= 7.0.0), gettext, texinfo, pkg-config, libkrb5-dev, help2man, libidn11-dev, libgnutls28-dev, libntlm0-dev, dh-autoreconf, valgrind [amd64 i386 powerpc]
+Build-Depends: cdbs, debhelper (>= 7.0.0), gettext, texinfo, pkg-config, libkrb5-dev, help2man, libidn11-dev, libgnutls28-dev, libntlm0-dev, dh-autoreconf, automake1.11, valgrind [amd64 i386 powerpc]
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xmpp/gsasl.git
 Vcs-Git: git://anonscm.debian.org/pkg-xmpp/gsasl.git
 Homepage: http://www.gnu.org/software/gsasl/
diff --git a/debian/rules b/debian/rules
index 45b0de2..35ea60d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_DH_STRIP_ARGS = --dbg-package=gsasl-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/gsasl.git