debian/changelog

+junit4 (4.12-7) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898146)
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889389)
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+  * Switch to debhelper level 11
+  * Use a secure URL in debian/watch
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 08 May 2018 22:24:28 +0200
+
 junit4 (4.12-6) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -3,20 +3,19 @@ Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Florian Weimer <fw@deneb.enyo.de>,
            Varun Hiremath <varun@debian.org>,
-           Damien Raude-Morvan <drazzib@debian.org>,
            Ludovic Claude <ludovic.claude@laposte.net>,
            Jakub Adam <jakub.adam@ktknet.cz>,
            Emmanuel Bourg <ebourg@apache.org>
 Priority: optional
-Build-Depends: debhelper (>= 10), default-jdk, javahelper
+Build-Depends: debhelper (>= 11), default-jdk, javahelper
 Build-Depends-Indep: default-jdk-doc,
                      libhamcrest-java (>= 1.3),
                      libhamcrest-java-doc,
                      libmaven-javadoc-plugin-java,
                      maven-debian-helper (>= 2.2)
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/junit4.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/junit4.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/junit4.git
+Vcs-Browser: https://salsa.debian.org/java-team/junit4
 Homepage: http://www.junit.org
 
 Package: junit4

debian/junit4-doc.doc-base.2

@@ -6,6 +6,5 @@ Abstract: This is the manual of JUnit 4, a framework
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/junit4-doc/homepage.html
-Files: /usr/share/doc/junit4-doc/*
-
+Index: /usr/share/doc/junit4/homepage.html
+Files: /usr/share/doc/junit4/*

debian/junit4-doc.docs

 doc
 doc/homepage.html
 *.txt
-*.css
 *.html
 

debian/patches/java10-compatibility.patch

+Description: Fixes the errors with Java 10
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/test/java/org/junit/tests/running/core/MainRunner.java
++++ b/src/test/java/org/junit/tests/running/core/MainRunner.java
+@@ -40,11 +40,6 @@
+         }
+ 
+         @Override
+-        public boolean getInCheck() {
+-            return (originalSecurityManager != null) && originalSecurityManager.getInCheck();
+-        }
+-
+-        @Override
+         public Object getSecurityContext() {
+             return (originalSecurityManager == null) ? super.getSecurityContext() : originalSecurityManager.getSecurityContext();
+         }

debian/patches/series

@@ -2,3 +2,4 @@ exclude-dependency-sources.patch
 Version.java.patch
 privacy-breach-logo.patch
 java9-compatibility.patch
+java10-compatibility.patch

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@ --with javahelper
-
-get-orig-source:
-	-uscan --upstream-version 0 --rename

debian/watch

 version=3
-http://github.com/junit-team/junit/tags/ .*/r(\d[\d\.]+)\.tar\.gz debian debian/orig-tar.sh
+https://github.com/junit-team/junit/tags/ .*/r(\d[\d\.]+)\.tar\.gz debian debian/orig-tar.sh