[gdal] 01/02: Add automake1.11 to Build-Conflicts, causes FTBFS in experimental.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit efbc8a807b0bd0a3b34c6bd418d406363e8597d5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Apr 19 21:44:47 2016 +0200

    Add automake1.11 to Build-Conflicts, causes FTBFS in experimental.
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ddd491c..477bebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (2.1.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Add automake1.11 to Build-Conflicts, causes FTBFS in experimental.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Apr 2016 19:30:36 +0200
+
 gdal (2.1.0~rc1+dfsg-1~exp1) experimental; urgency=medium
 
   * Update symbols for hppa & x32.
diff --git a/debian/control b/debian/control
index fd835c9..4a2c0f0 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,8 @@ Build-Depends: debhelper (>= 9),
                swig,
                unixodbc-dev (>= 2.2.11),
                zlib1g-dev
-Build-Conflicts: python-setuptools
+Build-Conflicts: automake1.11,
+                 python-setuptools
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal.git -b experimental-2.1

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