[med-svn] [fis-gtm] 01/01: Fix build issue by adding Build-Conflicts: locales-all

[Andreas Tille]

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

tille pushed a commit to branch master
in repository fis-gtm.

commit b85926cd97b029355cbe3b46d4145e75fccdcfe9
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jul 4 21:58:24 2015 +0200

    Fix build issue by adding Build-Conflicts: locales-all
---
 debian/changelog | 8 ++++++++
 debian/control   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0e0f823..fd38ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fis-gtm (6.2-002A-2) unstable; urgency=medium
+
+  * Fix build issue by adding Build-Conflicts: locales-all (thanks for
+    the patch to Chris West <solo-debianbugs at goeswhere.com>)
+    Closes: #791405
+
+ -- Andreas Tille <tille at debian.org>  Sat, 04 Jul 2015 21:57:28 +0200
+
 fis-gtm (6.2-002A-1) unstable; urgency=medium
 
   * Import latest sources and update package version
diff --git a/debian/control b/debian/control
index 1c5d6a3..556133a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
                libelf-dev,
                gcc-multilib,
                cmake (>= 2.8.5)
+Build-Conflicts: locales-all
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/fis-gtm.git
 Vcs-Git: git://anonscm.debian.org/debian-med/fis-gtm.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git