[sikuli] 07/09: Upstream switched back from testng to junit

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit b8803320ac5b3d260b0771dad8b05f3ae90d9756
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Oct 6 16:18:49 2014 +0200

    Upstream switched back from testng to junit
---
 debian/control          | 5 +++--
 debian/maven.rules      | 2 +-
 debian/maven.rules.ours | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index aec32ea..3279bcc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,13 @@ Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.6)
  , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
  , libswing-layout-java, libswingx-java, libjgoodies-forms-java
  , libjson-simple-java, libmac-widgets-java , libjackson2-core-java
- , libjackson2-databind-java, testng, libjavassist-java, libjna-java
+ , libjackson2-databind-java, junit4, libjavassist-java, libjna-java
  , libbytelist-java, libjruby-joni-java, libjoda-time-java
  , autoconf, automake, libtool
 # We only use the docs from java packages kept in the 'Depends' field of
 # libsikulix-script-java
-# No doc package exist for: libbsh-java, libcommons-cli-java, testng, jruby
+# No doc package exist for: libbsh-java, libcommons-cli-java, jruby
+# No need for: junit4-doc
  , default-jdk-doc, jython-doc, libswing-layout-java-doc, libjavassist-java-doc, libjxgrabkey-doc
 Standards-Version: 3.9.5
 Homepage: http://www.sikulix.com
diff --git a/debian/maven.rules b/debian/maven.rules
index 626fb5b..f2d4623 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,4 +5,4 @@ com.jgoodies s/forms/jgoodies-forms/ jar s/.*/debian/ * *
 s/org\.javassist/javassist/ javassist jar s/.*/debian/ * *
 org.jruby s/jruby-complete/jruby/ jar s/.*/debian/ * *
 s/org\.swinglabs\.swingx/org.swinglabs/ swingx-core jar s/1\..*/1.x/ * *
-org.testng testng jar s/6\..*/6.x/ * *
+junit junit jar s/4\..*/4.x/ * *
diff --git a/debian/maven.rules.ours b/debian/maven.rules.ours
index 626fb5b..f2d4623 100644
--- a/debian/maven.rules.ours
+++ b/debian/maven.rules.ours
@@ -5,4 +5,4 @@ com.jgoodies s/forms/jgoodies-forms/ jar s/.*/debian/ * *
 s/org\.javassist/javassist/ javassist jar s/.*/debian/ * *
 org.jruby s/jruby-complete/jruby/ jar s/.*/debian/ * *
 s/org\.swinglabs\.swingx/org.swinglabs/ swingx-core jar s/1\..*/1.x/ * *
-org.testng testng jar s/6\..*/6.x/ * *
+junit junit jar s/4\..*/4.x/ * *

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