This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch master
in repository maven-debian-helper.
commit 5ffe0e850ad36d9c749f6936cbdae35f31289004
Author: Christopher Hoskin <mans0...@debian.org>
Date: Fri Dec 1 07:40:52 2017 +0000
Fix "quilt and mh_patchpom sequence" by inserting extra calls to
mh_(un)patchpoms in share/perl/maven.pm (Closes: #883239)
---
debian/changelog | 8 ++++++++
share/perl/maven.pm | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 977fbac..bff31fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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 <mans0...@debian.org> Fri, 01 Dec 2017 07:32:10 +0000
+
maven-debian-helper (2.2.7) unstable; urgency=medium
* Team upload.
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index ec4334d..1efc68d 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -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");
}
--
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
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
