[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 85c21a6c868d34753d40f9db6df6d4048bd78866
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Fri Jan 6 00:20:32 2012 +0100

    Create again the libplexus-compiler-java-doc package.

diff --git a/debian/changelog b/debian/changelog
index 287a908..43db18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
   * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
     cannot compile with AspectJ 1.6
   * Update description
+  * Create again the libplexus-compiler-java-doc package.
   * d/maven.rules: use version 1.x for the artifacts in this package instead
     of 'debian'
   * d/watch: update to new location on Github
diff --git a/debian/control b/debian/control
index 9d7854f..fdef005 100644
--- a/debian/control
+++ b/debian/control
@@ -34,22 +34,22 @@ Description: Plexus compiler system
  This package provides the Plexus Compiler API and its implementation modules
  supporting javac, jikes, eclipse, aspectj and csharp compilers.
 
-# DISABLED because javadoc fails:
-#Package: libplexus-compiler-java-doc
-#Architecture: all
-#Section: doc
-#Depends: ${misc:Depends}, ${maven:DocDepends}
-#Recommends: ${maven:DocOptionalDepends}
-#Suggests: libplexus-compiler-java
-#Description: Documentation for The API for the Plexus compiler system
-# The Plexus project provides a full software stack for creating and executing
-# software projects. Based on the Plexus container, the applications can
-# utilise component-oriented programming to build modular, reusable components
-# that can easily be assembled and reused.
-# .
-# This package provides the Plexus Compiler API.
-# .
-# This package contains the API documentation of libplexus-compiler-java.
+Package: libplexus-compiler-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libplexus-compiler-java
+Description: Documentation for The API for the Plexus compiler system
+ The Plexus project provides a full software stack for creating and executing
+ software projects. Based on the Plexus container, the applications can
+ utilise component-oriented programming to build modular, reusable components
+ that can easily be assembled and reused.
+ .
+ libplexus-compiler-java provides the Plexus Compiler API and its implementation
+ modules supporting javac, jikes, eclipse, aspectj and csharp compilers.
+ .
+ This package contains the API documentation of libplexus-compiler-java.
 
 Package: libplexus-compiler-api-java
 Architecture: all

-- 
Plexus Compiler