[jblas] 01/02: address FTBFS when locales-all is installed

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jblas.

commit d0dc42d54472abce2e2660aa61c9810e6badba9e
Author: tony mancill <tmancill at debian.org>
Date:   Wed Jun 10 22:27:14 2015 -0700

    address FTBFS when locales-all is installed
---
 debian/changelog |  7 +++++++
 debian/control   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc94f8f..f457f6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jblas (1.2.3-6) UNRELEASED; urgency=medium
+
+  * Declare a Build-Conflicts with locales-all.  See #788352.
+    (Closes: #788353)
+
+ -- tony mancill <tmancill at debian.org>  Wed, 10 Jun 2015 22:24:43 -0700
+
 jblas (1.2.3-5) unstable; urgency=medium
 
   * Tweak debian/rules to address FTBFS (tests) on ppc64el.
diff --git a/debian/control b/debian/control
index ce33e17..0f5e56c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,16 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Soeren Sonnenburg <sonne at debian.org>,
  Torsten Werner <twerner at debian.org>,
  tony mancill <tmancill at debian.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, ant-optional, gfortran,
- libatlas-base-dev, ruby, locales, junit4
+Build-Depends: cdbs,
+ debhelper (>= 9),
+ default-jdk,
+ ant-optional,
+ gfortran,
+ libatlas-base-dev,
+ ruby,
+ locales,
+ junit4
+Build-Conflicts: locales-all
 Standards-Version: 3.9.6
 Section: science
 Homepage: http://jblas.org

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