[tycho] 05/12: Revert "Add libtycho-java Build-Conflicts"

[Markus Koschany]

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

apo pushed a commit to branch master
in repository tycho.

commit 385e7a82ee53e3e9db459f53e94d419aa1a94dd7
Author: Markus Koschany <apo at debian.org>
Date:   Sat Sep 2 02:19:13 2017 +0200

    Revert "Add libtycho-java Build-Conflicts"
    
    This reverts commit a3843238ae9cbef864e90d752a18ce77fd6af739.
---
 debian/changelog | 4 ++--
 debian/control   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98056a0..790b191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,8 @@ tycho (0.25.0-2) UNRELEASED; urgency=medium
 
   [ Christopher Hoskin ]
   * Add debian/clean (build with debuild -tc so that mh_unpatchpoms is called
-    before quilt patches are unapplied)   
-  * Add libtycho-java Build-Conflicts
+    before quilt patches are unapplied)
+     
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Jan 2017 14:51:11 +0100
 
diff --git a/debian/control b/debian/control
index 6c4df82..e41e31c 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,6 @@ Build-Depends:
  rsync,
  sat4j (>= 2.3.5),
  zip
-Build-Conflicts: libtycho-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/tycho.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tycho.git

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