[libcommons-net-java] 28/31: 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 libcommons-net-java.

commit 03b9f3100ec0c4195294de89ca4c8829ef2d1818
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 16 19:49:25 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index f8aaad1..6512147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libcommons-net-java (3.3-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #694462)
+    - Build depend on junit4 instead of junit
   * Reuse the original libcommons-net-java package for the new releases
   * debian/control:
     - Improved the package description
diff --git a/debian/control b/debian/control
index 8418ab6..7241d96 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 9), cdbs, default-jdk
-Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc, junit
+Build-Depends-Indep: ant, ant-optional, maven-ant-helper, maven-repo-helper, default-jdk-doc, junit4
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-net-java.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-net-java.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 88b30e6..993fa59 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1 @@
-commons-net commons-net jar s/2\..+/2.x/
-junit junit jar s/3\..*/3.x/
+junit junit jar s/4\..*/4.x/
diff --git a/debian/rules b/debian/rules
index d7a2acf..9808d4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps ant-junit junit
+DEB_JARS             := ant-nodeps ant-junit ant-junit4 junit4
 DEB_ANT_BUILD_TARGET := package javadoc
 # work with a slightly modified version of maven-ant-helper's build file:
 DEB_ANT_BUILDFILE    := debian/maven-build.xml

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