This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit 6c82ed347c07591659d849f82bbc96f4327cf3a6 Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 5 15:14:58 2014 +0100 Do not add optional test dependencies to ${maven:OptionalDepends} --- debian/changelog | 2 ++ .../src/main/java/org/debian/maven/packager/DependenciesSolver.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3cde7e..2281fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ maven-debian-helper (1.6.7) UNRELEASED; urgency=medium * The optional Maven dependencies are now suggested and not recommended in the package generated by mh_make + * The optional test dependencies are no longer added to the + ${maven:OptionalDepends} substitution variable * The generated Vcs-* fields now refer to Git instead of Subversion (Closes: #639338) * Added com.googlecode.maven-gcu-plugin:maven-gcu-plugin to the ignored diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java index 6d5ee3a..4f61099 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java @@ -798,10 +798,10 @@ public class DependenciesSolver { debianDeps.add(COMPILE, libraryWithVersionConstraint); } } else { - if (dependency.isOptional()) { - debianDeps.add(OPTIONAL, libraryWithVersionConstraint); - } else if ("test".equals(dependency.getScope())) { + if ("test".equals(dependency.getScope())) { debianDeps.add(TEST, libraryWithVersionConstraint); + } else if (dependency.isOptional()) { + debianDeps.add(OPTIONAL, libraryWithVersionConstraint); } else { debianDeps.add(RUNTIME, libraryWithVersionConstraint); } -- 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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
