[maven-debian-helper] 01/01: The dependencies of the *-java-doc packages are now recommended to comply with the Java policy

[Emmanuel Bourg]

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 052b5ffd909ebff9dbfdb76e9b32a2744d3e724a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 6 15:38:04 2014 +0200

    The dependencies of the *-java-doc packages are now recommended to comply with the Java policy
---
 debian/changelog                                       | 2 ++
 maven-packager-utils/src/main/resources/control.ant.vm | 6 ++----
 maven-packager-utils/src/main/resources/control.vm     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 891ff1d..778bc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ maven-debian-helper (1.6.9) UNRELEASED; urgency=medium
     debian/rule get-orig-source target to work around #748462
   * The generated control file now specifies Standards-Version: 3.9.6
   * Shortened the Vcs-Browser URL in the generated control file
+  * The dependencies of the *-java-doc packages are now recommended to comply
+    with the Java policy
   * debian/control:
     - Depend on maven-repo-helper >= 1.8.9
     - Standards-Version updated to 3.9.6 (no changes)
diff --git a/maven-packager-utils/src/main/resources/control.ant.vm b/maven-packager-utils/src/main/resources/control.ant.vm
index 8ac9521..981ca05 100644
--- a/maven-packager-utils/src/main/resources/control.ant.vm
+++ b/maven-packager-utils/src/main/resources/control.ant.vm
@@ -54,10 +54,8 @@ Description: ${project.Name}
 Package: ${binPackage}-doc
 Architecture: all
 Section: doc
-Depends: ${dollar}{misc:Depends}, #printDependencies($javadocDependencies)$space
-#if(!$javadocOptionalDependencies.isEmpty())
-Recommends: #printDependencies($javadocOptionalDependencies)$space
-#end
+Depends: ${dollar}{misc:Depends}
+Recommends: #printDependencies($javadocDependencies)$space#if(!$javadocOptionalDependencies.isEmpty()) ,#printDependencies($javadocOptionalDependencies)$space#end
 Suggests: ${binPackage}
 Description: Documentation for ${project.Name}
 #if ($description.isEmpty()) TODO - fill the description
diff --git a/maven-packager-utils/src/main/resources/control.vm b/maven-packager-utils/src/main/resources/control.vm
index 31490f0..3ad6152 100644
--- a/maven-packager-utils/src/main/resources/control.vm
+++ b/maven-packager-utils/src/main/resources/control.vm
@@ -50,8 +50,8 @@ Description: ${project.Name}
 Package: ${binPackage}-doc
 Architecture: all
 Section: doc
-Depends: ${dollar}{misc:Depends}, ${dollar}{maven:DocDepends}
-Recommends: ${dollar}{maven:DocOptionalDepends}
+Depends: ${dollar}{misc:Depends}
+Recommends: ${dollar}{maven:DocDepends}, ${dollar}{maven:DocOptionalDepends}
 Suggests: ${binPackage}
 Description: Documentation for ${project.Name}
 #if ($description.isEmpty()) TODO - fill the description

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