[lwjgl] 02/02: remove binutils-gold conflict

[Michael Gilbert]

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

mgilbert pushed a commit to branch master
in repository lwjgl.

commit edc3b3882ada5894c3b22791285a89fabdb89474
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Oct 13 02:06:05 2014 -0400

    remove binutils-gold conflict
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13bc5fd..4572ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lwjgl (2.7.1+dfsg-4) UNRELEASED; urgency=medium
+
+  * Remove binutils-gold build conflict (closes: #749957).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Mon, 13 Oct 2014 06:05:00 +0000
+
 lwjgl (2.7.1+dfsg-3) unstable; urgency=low
 
   * add java bin dir to the PATH environment (closes: #664180)
diff --git a/debian/control b/debian/control
index b5113df..5efad0f 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,10 @@ Build-Depends:
  libxt-dev,
 Build-Depends-Indep:
  default-jdk-doc,
-Build-Conflicts:
- binutils-gold,
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
 Homepage: http://lwjgl.org/
-DM-Upload-Allowed: yes
 
 Package: liblwjgl-java
 Architecture: all

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