[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-21-g7633148

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 2ac1311fea234fc6dbf744c7b79559759f1fc960
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jan 3 00:45:57 2012 +0100

    New upstream version, build missing modules

diff --git a/debian/changelog b/debian/changelog
index bc21d62..a5be000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+plexus-compiler (1.8.2-1) UNRELEASED; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Add dependency on libplexus-components-java, libecj-java
+  * Update description
+  * d/maven.rules: use version 1.x for the artifacts in this package instead
+    of 'debian'
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 03 Jan 2012 00:27:31 +0100
+
 plexus-compiler (1.6-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1b79999..ebb7333 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: plexus-compiler
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java, libmaven2-core-java,  
+Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java (>= 2.0),
+ libecj-java, libmaven2-core-java, libplexus-components-java (>= 1.1.16), 
  libplexus-container-default-java, libplexus-utils-java, junit (>= 3.8.2),  
  default-jdk-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc,  
  libplexus-utils-java-doc, libmaven-javadoc-plugin-java, libaspectj-java
@@ -24,13 +25,14 @@ Breaks: libplexus-compiler-api-java (<< 1.6-1~),
 Replaces: libplexus-compiler-api-java (<< 1.6-1~),
  libplexus-compiler-manager-java (<< 1.6-1~),
  libplexus-compiler-javac-java (<< 1.6-1~)
-Description: API for the Plexus compiler system
+Description: 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 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
diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms
index 9387c1a..89f8617 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -25,13 +25,13 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
 plexus-compiler-api/pom.xml --has-package-version
 plexus-compiler-test/pom.xml --has-package-version
 plexus-compiler-manager/pom.xml --has-package-version
 plexus-compilers/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore
+plexus-compilers/plexus-compiler-aspectj/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-eclipse/pom.xml --ignore
+plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version
+plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version
-plexus-compilers/plexus-compiler-jikes/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index b47b61d..d9825b6 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -13,5 +13,5 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM before mvn clean is called
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 0088a40..a555a53 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -12,5 +12,6 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
+org.apache.maven.plugins maven-gpg-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 822f087..77aa245 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -15,5 +15,5 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 1428025..e9fb3ba 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -14,7 +14,7 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
 junit junit jar s/3\..*/3.x/ * *
 org.codehaus.plexus plexus-compiler-api jar s/.*/debian/ * *

-- 
Plexus Compiler