[lhapdf] 01/04: Remove build-conflicts with automake and instead request the use of automake-1.1 through d/rules

[Mattia Rizzolo]

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

mattia pushed a commit to annotated tag debian/5.9.1-5
in repository lhapdf.

commit d175e6a0d9d3ebb16d24aa2ec3ae8cb1490f1f61
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Apr 6 14:43:30 2017 +0200

    Remove build-conflicts with automake and instead request the use of automake-1.1 through d/rules
    
    Closes: #859710
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/control | 1 -
 debian/rules   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index be4a974..6c4d16c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 Build-Depends: debhelper (>= 8), dh-autoreconf, automake1.11, gfortran, swig, python-dev, dh-python, octave-pkg-dev, gnuplot
 Build-Depends-Indep: doxygen-latex, ghostscript
-Build-Conflicts: automake
 Standards-Version: 3.9.4
 Homepage: http://projects.hepforge.org/lhapdf/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/lhapdf.git
diff --git a/debian/rules b/debian/rules
index e882b19..8eabb0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,9 @@ export DEB_BUILD_OPTIONS
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS FFLAGS
 
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf ccwrap/doxy

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lhapdf.git