[jedit] 08/09: add build-conflict on junit(3)

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jedit.

commit 7ba24b1aace404862f331c9b16189061685d9efe
Author: tony mancill <tmancill at debian.org>
Date:   Mon Oct 5 04:37:38 2015 +0000

    add build-conflict on junit(3)
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index fbc5fb7..1b855a5 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: ant,
                libxerces2-java,
                quilt (>= 0.46-7~),
                xsltproc
+Build-Conflicts: junit
 Build-Depends-Indep: default-jdk
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jedit.git

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