[plexus-compiler] 01/04: Allow co-installation with plexus-compiler-1.0 packages

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository plexus-compiler.

commit 249efc8590b975d5de5cfb7041c7fa12f2919a85
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Mar 5 19:15:24 2015 -0300

    Allow co-installation with plexus-compiler-1.0 packages
---
 debian/changelog                    |  7 +++++++
 debian/libplexus-compiler-java.poms | 14 +++++++-------
 debian/maven.publishedRules         |  7 +++++++
 debian/maven.rules                  |  9 +++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 430c5a0..4bf97b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plexus-compiler (2.2-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Allow co-installation with plexus-compiler-1.0 packages.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 05 Mar 2015 19:14:56 -0300
+
 plexus-compiler (2.2-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/libplexus-compiler-java.poms b/debian/libplexus-compiler-java.poms
index 15d5c51..6bde40d 100644
--- a/debian/libplexus-compiler-java.poms
+++ b/debian/libplexus-compiler-java.poms
@@ -26,12 +26,12 @@
 #     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version
-plexus-compiler-api/pom.xml --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api-*.jar --java-lib
-plexus-compiler-test/pom.xml --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test-*.jar --java-lib
-plexus-compiler-manager/pom.xml --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager-*.jar --java-lib
+plexus-compiler-api/pom.xml --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api-*.jar --java-lib --usj-name=plexus-compiler-api-2.x
+plexus-compiler-test/pom.xml --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test-*.jar --java-lib --usj-name=plexus-compiler-test-2.x
+plexus-compiler-manager/pom.xml --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager-*.jar --java-lib --usj-name=plexus-compiler-manager-2.x
 plexus-compilers/pom.xml --has-package-version
 plexus-compilers/plexus-compiler-aspectj/pom.xml --ignore
-plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-*.jar --java-lib
-plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-*.jar --java-lib
-plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-*.jar --java-lib
-plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-*.jar --java-lib
+plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp-*.jar --java-lib --usj-name=plexus-compiler-csharp-2.x
+plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse-*.jar --java-lib --usj-name=plexus-compiler-eclipse-2.x
+plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes-*.jar --java-lib --usj-name=plexus-compiler-jikes-2.x
+plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac-*.jar --java-lib --usj-name=plexus-compiler-javac-2.x
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 8b13789..caac81c 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1 +1,8 @@
 
+org.codehaus.plexus plexus-compiler-api jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-csharp jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-eclipse jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-javac jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-jikes jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-manager jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-test jar s/.*/2.x/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index c82177f..075f446 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,15 @@
 
 junit junit jar s/.*/3.x/ * *
 junit junit jar s/3\..*/3.x/ * *
+org.codehaus.plexus plexus-compiler-api jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-csharp jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-eclipse jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-javac jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-jikes jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-manager jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler-test jar s/.*/2.x/ * *
+org.codehaus.plexus plexus-compiler pom s/.*/2.x/ * *
+org.codehaus.plexus plexus-compilers pom s/.*/2.x/ * *
 org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 s/org.eclipse.tycho/org.eclipse.jdt.core.compiler/ s/org.eclipse.jdt.core/ecj/ jar s/.*/debian/ * *

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