[doxia] 16/35: 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 doxia.

commit 840770e5ca17ad9ea96064599d5b1acbd45741ef
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 27 21:14:52 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index c1a1879..393dc1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ doxia (1.4-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Build depend on maven-debian-helper (>= 2.2.2)
+    - Build depend on junit4 instead of junit
     - No longer build the doxia-book module (removed upstream)
     - Ignore the new doxia-module-markdown module
   * Removed the unused dependency on libmaven2-core-java
diff --git a/debian/control b/debian/control
index 2d8564a..fefbfc9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10),
                maven-debian-helper (>= 2.2.2~)
 Build-Depends-Indep: default-jdk-doc,
                      fop (>= 1:2.0),
-                     junit,
+                     junit4,
                      libcommons-configuration-java,
                      libcommons-configuration-java-doc,
                      libcommons-lang-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 902ee49..a87d8a0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,7 +17,7 @@
 #   junit junit jar s/3\\..*/3.x/
 
 com.lowagie itext jar 1.4 * *
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/4.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 org.apache.maven.doxia doxia-book jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-core jar s/.*/debian/ * *

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