[plexus-containers1.5] 04/07: Build depend on junit4 instead of junit

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-containers1.5.

commit 14beec5634fe9c7ba6d68abb0232c8ba8cbe114e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 19 12:44:33 2015 +0100

    Build depend on junit4 instead of junit
---
 debian/changelog   | 1 +
 debian/control     | 2 +-
 debian/maven.rules | 2 +-
 debian/rules       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc60395..aad3b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ plexus-containers1.5 (1.6-1) UNRELEASED; urgency=medium
   * New upstream release
     - Removed 01-classworlds-compatibility.patch (fixed upstream)
     - Depend on asm4 instead of asm3 (Closes: #800862)
+    - Build depend on junit4 instead of junit
   * debian/watch: Track the release tags on GitHub
   * Updated Standards-Version to 3.9.6 (no changes)
 
diff --git a/debian/control b/debian/control
index 18dafc6..52b59d0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk
 Build-Depends-Indep: ant,
                      ant-optional,
-                     junit,
+                     junit4,
                      libasm4-java,
                      libcommons-cli-java,
                      libguava-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 3a22037..74a53d5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,7 +18,7 @@
 
 org.ow2.asm asm* jar s/.*/4.x/ * *
 s/jdom/org.jdom/ jdom jar s/.*/debian/ * *
-junit junit jar s/.*/3.x/ * *
+junit junit jar s/.*/4.x/ * *
 s/qdox/com.thoughtworks.qdox/ * * s/.*/debian/ * *
 s/com.google.collections/com.google.guava/ s/google-collections/guava/ * s/.*/debian/ * *
 
diff --git a/debian/rules b/debian/rules
index 98af26d..5c17a8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~beta/-beta-/")
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps asm4 asm4-core commons-cli guava \
-                        jdom1 junit maven-artifact maven-artifact-manager maven-core \
+                        jdom1 junit4 maven-artifact maven-artifact-manager maven-core \
                         maven-model maven-plugin-api maven-project maven2 \
                         plexus-classworlds2 plexus-cli plexus-utils2 qdox xbean-reflect
 DEB_ANT_BUILD_TARGET := package javadoc

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