[doxia] 01/07: Replaced classpath-doc/openjdk-6-doc with default-jdk-doc

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/1.1.4-1
in repository doxia.

commit f463975cdc3aba99c560a2a9ee145d2fd843f27f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat May 1 17:39:06 2010 +0000

    Replaced classpath-doc/openjdk-6-doc with default-jdk-doc
---
 debian/changelog | 6 ++++++
 debian/control   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4caea7b..5fc890b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+doxia (1.1.2-2) UNRELEASED; urgency=low
+
+  * Replaced classpath-doc/openjdk-6-doc with default-jdk-doc (Closes: #567272)
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 01 May 2010 19:20:58 +0200
+
 doxia (1.1.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d927421..c1664fc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Trygve Laugstol <trygvis at inamo.no>,
  Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
  Torsten Werner <twerner at debian.org>
 Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4),
- ant-optional, libmodello-java, openjdk-6-doc, libplexus-containers-java,
+ ant-optional, libmodello-java, default-jdk-doc, libplexus-containers-java,
  libplexus-utils-java, libplexus-i18n-java, libxerces2-java,
  libcommons-configuration-java, fop, liblog4j1.2-java, libjaxp1.3-java,
  libitext1-java, libcommons-httpclient-java
@@ -38,9 +38,9 @@ Description: a powerful content generation framework
 Package: libdoxia-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
+Depends: ${misc:Depends}, default-jdk-doc
 Suggests: libdoxia-java
-Description: a powerful content generation framework
+Description: a powerful content generation framework (javadoc)
  Doxia is a content generation framework which aims to provide its users 
  with powerful techniques for generating static and dynamic content.
  .

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