Skip to content
Snippets Groups Projects
Commit 5ffe0e85 authored by Christopher Hoskin's avatar Christopher Hoskin
Browse files

Fix "quilt and mh_patchpom sequence" by inserting extra calls to 

mh_(un)patchpoms in share/perl/maven.pm (Closes: #883239)
parent 0705963d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/changelog
+ 8
− 0
View file @ 5ffe0e85
maven-debian-helper (2.2.8) UNRELEASED; urgency=medium
* Team upload.
* Fix "quilt and mh_patchpom sequence" by inserting extra calls to
mh_(un)patchpoms in share/perl/maven.pm (Closes: #883239)
-- Christopher Hoskin <mans0954@debian.org> Fri, 01 Dec 2017 07:32:10 +0000
maven-debian-helper (2.2.7) unstable; urgency=medium
* Team upload.
......
share/perl/maven.pm
+ 10
− 0
View file @ 5ffe0e85
......@@ -119,10 +119,13 @@ sub install {
# clean up generated docs
$this->doit_in_builddir("bash", "-c", "rm -f target/apidocs/*.sh target/apidocs/options");
}
$this->doit_in_sourcedir("mh_unpatchpoms", "-p$this->{package}");
doit("rm", "-f", "debian/stamp-poms-patched");
}
sub clean {
my $this=shift;
my @patch_args;
# If this directory if absent, we must not have anything to clean;
# don't populate the directory just to run a clean target.
......@@ -132,6 +135,13 @@ sub clean {
push(@_, "clean");
}
if (! -e "debian/stamp-poms-patched") {
$this->doit_in_sourcedir("mh_patchpoms", "-p$this->{package}",
"--debian-build", "--keep-pom-version",
"--maven-repo=$this->{cwd}/debian/maven-repo", @patch_args);
doit("touch", "debian/stamp-poms-patched");
}
$this->doit_in_builddir_noerror(@{$this->{maven_cmd}}, @_);
doit("rm", "-r", "$this->{cwd}/debian/maven-repo");
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment