[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 8c42ef2eb06aee306c4765543d4b25ea26c05374
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jan 3 20:44:51 2012 +0100

    Don't compile plexus-compiler-aspectj, it doesn't work with current AspectJ 1.6

diff --git a/debian/control b/debian/control
index ebb7333..cfcbc06 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: libplexus-component-metadata-java, libcommons-lang-java (>=
  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
+ libplexus-utils-java-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-compiler.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-compiler.git
diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms
index 89f8617..8c31adb 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -30,7 +30,7 @@ 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 --has-package-version
+plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore
 plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 31f799d..3396c38 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -30,5 +30,5 @@ org.codehaus.plexus plexus-compilers pom s/1\..*/1.x/ * *
 org.codehaus.plexus plexus-components pom s/1\..*/1.x/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ * *
-s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
-s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
+#s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
+#s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *

-- 
Plexus Compiler