The following commit has been merged in the master branch:
commit e972a192cb2a9ee1bb2cd345db5eb59799aad297
Author: James Page <james.p...@ubuntu.com>
Date: Sun Feb 17 17:50:23 2013 +0000
New upstream release:
* New upstream release:
- d/control,maven.rules: Bump junit -> junit4.
diff --git a/debian/changelog b/debian/changelog
index b3bf938..438b01a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins-winstone (0.9.10-jenkins-42+dfsg-1~exp) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - d/control,maven.rules: Bump junit -> junit4.
+
+ -- James Page <james.p...@ubuntu.com> Sun, 17 Feb 2013 17:40:14 +0000
+
jenkins-winstone (0.9.10-jenkins-41+dfsg-1~exp1) experimental; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index db8bd64..ba7bb1d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
Build-Depends-Indep:
ant,
default-jdk-doc,
- junit (>= 3.8.1),
+ junit4,
libhttpunit-java,
libmaven-antrun-plugin-java,
libmaven-javadoc-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 127ed51..efae23e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,7 +16,7 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\\..*/3.x/
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
javax.servlet servlet-api jar s/2\..*/2.5/ * *
javax.servlet.jsp jsp-api jar s/2\..*/2.1/ * *
s/jtidy/net.sf.jtidy/ * * * * *
--
jenkins-winstone packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
