Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
maven-debian-helper
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Java Maintainers
maven-debian-helper
Commits
5ffe0e85
Commit
5ffe0e85
authored
7 years ago
by
Christopher Hoskin
Browse files
Options
Downloads
Patches
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+8
-0
8 additions, 0 deletions
debian/changelog
share/perl/maven.pm
+10
-0
10 additions, 0 deletions
share/perl/maven.pm
with
18 additions
and
0 deletions
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.
...
...
This diff is collapsed.
Click to expand it.
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
");
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment