[maven-debian-helper] 03/04: Adjust mh_resolve_dependencies arguments 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 7bb93de860b98dd5dc96d0fbdae81d8fbdeb6f88
Author: Wolodja Wentland <debian at babilen5.org>
Date:   Sat Aug 17 17:38:30 2013 +0200

    Adjust mh_resolve_dependencies arguments in dh to match CDBS
    
    This patch adds missing arguments to the mh_resolve_dependencies call in the
    dh build sequence that are present in CDBS.
---
 debian/changelog    |    1 +
 share/perl/maven.pm |    1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad37213..1bce9e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-debian-helper (1.6.5) UNRELEASED; urgency=low
   * Add Wolodja Wentland to uploaders
   * Prevent artifact installation during dh build (switch maven target from
     "install" to "package")
+  * Adjust mh_resolve_dependencies arguments 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 886ca8e..8c60ee2 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -90,6 +90,7 @@ sub install {
 	if ($this->{doc_package}) {
 		push(@resolvedep_args, "--javadoc");
 	}
+	push(@resolvedep_args, "--base-directory=$this->{cwd}", "--non-explore");
 
 	$this->doit_in_builddir(@{$this->{maven_cmd}},
 		"-Ddebian.package=$this->{package}",

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