[Git][java-team/javatools][master] 3 commits: jh_build: no longer ignore JH_JAR_EXTRA. (Closes: #945917)

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / javatools


Commits:
822f2a16 by tony mancill at 2019-12-05T05:45:31Z
jh_build: no longer ignore JH_JAR_EXTRA.  (Closes: #945917)

Thank you to Frédéric Perrin for the bug report and patch.

- - - - -
e4b069de by tony mancill at 2019-12-05T06:07:12Z
Fix Perl::Critic warning in jh_linkjars

- - - - -
e9015703 by tony mancill at 2019-12-05T06:07:12Z
interim changelog

- - - - -


3 changed files:

- debian/changelog
- jh_build
- jh_linkjars


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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 at debian.org>  Wed, 04 Dec 2019 22:02:19 -0800
+
 javatools (0.72.10) unstable; urgency=medium
 
   * Team upload.


=====================================
jh_build
=====================================
@@ -118,7 +118,7 @@ my (@javac_opts, @javadoc_opts, $main_class, $do_clean);
 my (@JAVAC, @JAVADOC, @JAR, @builds);
 
 $CLASSPATH =~ tr/:/ /;
- at JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if @JH_JAR_EXTRA;
+ at JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if defined $ENV{'JH_JAR_EXTRA'};
 
 # Work around #926542.
 if (any { $_ eq '-N' } @ARGV) {


=====================================
jh_linkjars
=====================================
@@ -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);



View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/d39b74aefb66fb0c7092c5b2e6785f6b22f9513e...e90157034b792449f4840a3767c0e3917df88b86

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/d39b74aefb66fb0c7092c5b2e6785f6b22f9513e...e90157034b792449f4840a3767c0e3917df88b86
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20191205/e189eaf1/attachment.html>