[maven-debian-helper] 04/04: Adjust debian-maven-plugin options in dh to match CDBS

[Wolodja Wentland]

This is an automated email from the git hooks/post-receive script.

babilen-guest pushed a commit to branch dev/cdbs_differences
in repository maven-debian-helper.

commit 2a8aa54f1488990e5f9fe97bba3afef447da2884
Author: Wolodja Wentland <debian at babilen5.org>
Date:   Sat Aug 17 18:05:42 2013 +0200

    Adjust debian-maven-plugin options in dh to match CDBS
    
    The dh build system included a call to the debian-maven-plugin that missed two
    options. The first of which sets the debian directory and the second the maven
    repository that should be used during the build.
---
 debian/changelog    |    1 +
 share/perl/maven.pm |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1bce9e5..9a2f599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ maven-debian-helper (1.6.5) UNRELEASED; urgency=low
   * Prevent artifact installation during dh build (switch maven target from
     "install" to "package")
   * Adjust mh_resolve_dependencies arguments in dh to match CDBS
+  * Adjust debian-maven-plugin options in dh to match CDBS
 
  -- Wolodja Wentland <debian at babilen5.org>  Sat, 17 Aug 2013 15:24:16 +0000
 
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 8c60ee2..1b4837a 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -93,7 +93,9 @@ sub install {
 	push(@resolvedep_args, "--base-directory=$this->{cwd}", "--non-explore");
 
 	$this->doit_in_builddir(@{$this->{maven_cmd}},
+		"-Ddebian.dir=$this->{cwd}/debian",
 		"-Ddebian.package=$this->{package}",
+		"-Dmaven.repo.local=$this->{cwd}/debian/maven-repo",
 		"-Dinstall.to.usj=true",
 		"org.debian.maven:debian-maven-plugin:$maven_debian_version:install");
 	$this->doit_in_builddir("mh_resolve_dependencies", "--non-interactive",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git