Emmanuel Bourg pushed to branch master at Debian Java Maintainers / junit4
Commits:
e1a2f4c7 by Emmanuel Bourg at 2018-05-08T00:34:06+02:00
Standards-Version updated to 4.1.4
- - - - -
18a56a0b by Emmanuel Bourg at 2018-05-08T00:34:12+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
9b5b1bd8 by Emmanuel Bourg at 2018-05-08T00:34:12+02:00
Removed Damien Raude-Morvan from the uploaders (Closes: #889389)
- - - - -
a969d35a by Emmanuel Bourg at 2018-05-08T00:34:12+02:00
Fixed the build failure with Java 10 (Closes: #898146)
- - - - -
3ee837d5 by Emmanuel Bourg at 2018-05-08T22:24:09+02:00
Switch to debhelper level 11
- - - - -
47dd968d by Emmanuel Bourg at 2018-05-08T22:24:15+02:00
Use a secure URL in debian/watch
- - - - -
69b18d1b by Emmanuel Bourg at 2018-05-08T22:24:35+02:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/junit4-doc.doc-base.2
- debian/junit4-doc.docs
- + debian/patches/java10-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 <ebo...@apache.org> Tue, 08 May 2018 22:24:28 +0200
+
junit4 (4.12-6) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,19 @@ Section: java
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Florian Weimer <f...@deneb.enyo.de>,
Varun Hiremath <va...@debian.org>,
- Damien Raude-Morvan <draz...@debian.org>,
Ludovic Claude <ludovic.cla...@laposte.net>,
Jakub Adam <jakub.a...@ktknet.cz>,
Emmanuel Bourg <ebo...@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
=====================================
--- a/debian/junit4-doc.doc-base.2
+++ b/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
=====================================
--- a/debian/junit4-doc.docs
+++ b/debian/junit4-doc.docs
@@ -1,6 +1,5 @@
doc
doc/homepage.html
*.txt
-*.css
*.html
=====================================
debian/patches/java10-compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/java10-compatibility.patch
@@ -0,0 +1,17 @@
+Description: Fixes the errors with Java 10
+Author: Emmanuel Bourg <ebo...@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
=====================================
--- a/debian/patches/series
+++ b/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
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,3 @@
%:
dh $@ --with javahelper
-
-get-orig-source:
- -uscan --upstream-version 0 --rename
=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
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
View it on GitLab:
https://salsa.debian.org/java-team/junit4/compare/a3a0207d797e182e3abcef819e9b7b196f3df444...69b18d1b25203db4d4eb10af1f74890ad7e0f554
---
View it on GitLab:
https://salsa.debian.org/java-team/junit4/compare/a3a0207d797e182e3abcef819e9b7b196f3df444...69b18d1b25203db4d4eb10af1f74890ad7e0f554
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
