This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit 6cfa8bd8504875c54b8cf16eb02a9ff6046b306e Author: Emmanuel Bourg <[email protected]> Date: Sun Aug 27 00:15:55 2017 +0200 Spawn a shell explicitly when necessary in the doit() calls of the DH buildsystem (Closes: #870404) --- debian/changelog | 3 +++ share/perl/maven.pm | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5db1dc..d5f2bef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ maven-debian-helper (2.2.3) UNRELEASED; urgency=medium * Team upload. + * Spawn a shell explicitly when necessary in the doit() calls of the DH + buildsystem (prevents a warning with DH 10 and an error with DH 11) + (Closes: #870404) * Honor the "nodoc" build option and skip the javadoc generation * Added the project.build.sourceEncoding property in the documentation header of the generated maven.properties file diff --git a/share/perl/maven.pm b/share/perl/maven.pm index 36b2d4c..cbbcc58 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -114,8 +114,7 @@ sub install { doit("cp","debian/$this->{package}.substvars", "debian/$this->{doc_package}.substvars"); # clean up generated docs - $this->doit_in_builddir("rm", "-f", "target/apidocs/*.sh", - "target/apidocs/options"); + $this->doit_in_builddir("bash", "-c", "rm -f target/apidocs/*.sh target/apidocs/options"); } } @@ -133,7 +132,7 @@ sub clean { $this->doit_in_builddir_noerror(@{$this->{maven_cmd}}, @_); doit("rm", "-r", "$this->{cwd}/debian/maven-repo"); } - $this->doit_in_builddir('for dir in $(find . -name target -type d); do if [ -f $(echo $dir | sed -e s/target$/pom.xml/) ]; then rm -Rf $dir; fi done'); + $this->doit_in_builddir("bash", "-c", 'for dir in $(find . -name target -type d); do if [ -f $(echo $dir | sed -e s/target$/pom.xml/) ]; then rm -Rf $dir; fi done'); $this->doit_in_sourcedir("mh_unpatchpoms", "-p$this->{package}"); doit("rm", "-f", "debian/stamp-poms-patched"); doit("mh_clean"); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
