Skip to content

Commits on Source 3

javatools (0.72.11) UNRELEASED; urgency=medium
* Team upload.
* jh_build: no longer ignore JH_JAR_EXTRA. (Closes: #945917)
Thank you to Frédéric Perrin for the bug report and patch.
* Fix Perl::Critic warning in jh_linkjars causing FTBFS
-- tony mancill <tmancill@debian.org> Wed, 04 Dec 2019 22:02:19 -0800
javatools (0.72.10) unstable; urgency=medium
* Team upload.
......
......@@ -118,7 +118,7 @@ my (@javac_opts, @javadoc_opts, $main_class, $do_clean);
my (@JAVAC, @JAVADOC, @JAR, @builds);
$CLASSPATH =~ tr/:/ /;
@JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if @JH_JAR_EXTRA;
@JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if defined $ENV{'JH_JAR_EXTRA'};
# Work around #926542.
if (any { $_ eq '-N' } @ARGV) {
......
......@@ -109,7 +109,7 @@ sub find_jars {
while (@packages) {
my $pkg = pop(@packages);
# Skip debhelper-compat because it is a virtual package #933715
next if $pkg =~ "debhelper-compat";
next if $pkg eq 'debhelper-compat';
my $dpkg_output = `dpkg -L "$pkg"`;
error_exitcode("dpkg -L \"$pkg\"") if $?;
my @jars = parse_dpkg_L($dpkg_output);
......