Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg
Commits: 16ee8e62 by tony mancill at 2020-07-14T21:18:24-07:00 apply patch for wrapper script Thank you to Tiago Stürmer Daitx for the patch Gbp-Dch: ignore - - - - - 07a6dae9 by tony mancill at 2020-07-14T21:20:05-07:00 Use debhelper-compat 13 - - - - - 507f2eaf by tony mancill at 2020-07-14T21:20:27-07:00 Use https URL for Homepage in debian/control - - - - - 63b941dd by tony mancill at 2020-07-14T21:29:40-07:00 Use https URL for Format in debian/copyright Gbp-Dch: ignore - - - - - ab658589 by tony mancill at 2020-07-14T21:29:40-07:00 freshen years in debian/copyright and Source: link - - - - - 34b9c4ff by tony mancill at 2020-07-14T21:30:59-07:00 Set "Rules-Requires-Root: no" in debian/control - - - - - 950f8346 by tony mancill at 2020-07-14T21:30:59-07:00 prepare for upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - debian/copyright - debian/patches/launchers.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,19 @@ +jtreg (5.1-b01-2) unstable; urgency=medium + + * Team upload. + + [ Tiago Stürmer Daitx ] + * d/p/launcher.patch: set JTREG_HOME earlier. (Closes: #965047, + LP: #1887587). + + [ tony mancill ] + * Use debhelper-compat 13 + * Use https URL for Homepage in debian/control + * Freshen years in debian/copyright and update Source: link + * Set "Rules-Requires-Root: no" in debian/control + + -- tony mancill <[email protected]> Tue, 14 Jul 2020 21:28:47 -0700 + jtreg (5.1-b01-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Guillaume Mazoyer <[email protected]> Build-Depends: ant, - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk, help2man, javahelp2, @@ -17,7 +17,8 @@ Build-Depends: Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/java-team/jtreg.git Vcs-Browser: https://salsa.debian.org/java-team/jtreg -Homepage: http://openjdk.java.net/jtreg +Homepage: https://openjdk.java.net/jtreg +Rules-Requires-Root: no Package: jtreg Architecture: all ===================================== debian/copyright ===================================== @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: jtreg -Source: http://download.java.net/openjdk/jtreg/ +Source: https://github.com/openjdk/jtreg/ Files: * -Copyright: 1996-2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright: 1996-2020, Oracle and/or its affiliates. All Rights Reserved. License: GPL-2 with Classpath exception This code is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 only, as ===================================== debian/patches/launchers.patch ===================================== @@ -25,17 +25,18 @@ Forwarded: not-needed # Verify java version (1.)5 or newer used to run jtdiff --- a/src/share/bin/jtreg.sh +++ b/src/share/bin/jtreg.sh -@@ -98,6 +98,9 @@ - fi - fi +@@ -70,6 +70,10 @@ + # Determine jtreg installation directory + JTREG_HOME=${JTREG_HOME:-$JT_HOME} # allow for old version of name +if [ -z "${JTREG_HOME}" ]; then + JTREG_HOME="/usr/share/jtreg" +fi - - # Look for -jdk option as possible default to run jtreg - # Unset IFS and use newline as arg separator to preserve spaces in args -@@ -125,7 +128,7 @@ ++ + if [ -n "$JTREG_HOME" ]; then + if [ ! -r $JTREG_HOME/lib/jtreg.jar ];then + echo "Invalid JTREG_HOME=$JTREG_HOME. Cannot find or read $JTREG_HOME/lib/jtreg.jar" +@@ -125,7 +129,7 @@ elif [ -n "$jdk" ]; then JTREG_JAVA="$jdk/bin/java" else View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/2748c2995f5ebafc920632f230ad173bea433597...950f8346bbe7871ce554082fd04503349ad27327 -- View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/2748c2995f5ebafc920632f230ad173bea433597...950f8346bbe7871ce554082fd04503349ad27327 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
