[pkg-java] r16572 - in trunk/antlr-maven-plugin/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Apr 26 08:53:22 UTC 2013
Author: ebourg-guest
Date: 2013-04-26 08:53:22 +0000 (Fri, 26 Apr 2013)
New Revision: 16572
Modified:
trunk/antlr-maven-plugin/debian/changelog
trunk/antlr-maven-plugin/debian/control
trunk/antlr-maven-plugin/debian/copyright
trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms
trunk/antlr-maven-plugin/debian/maven.ignoreRules
trunk/antlr-maven-plugin/debian/maven.rules
trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch
Log:
New upstream release (2.2)
Refreshed the patch
Added a dependency on libcommons-exec-java
Updated Standards-Version to 3.9.4 (no changes)
debian/copyright: Updated the Format URI to the version 1.0
Modified: trunk/antlr-maven-plugin/debian/changelog
===================================================================
--- trunk/antlr-maven-plugin/debian/changelog 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/changelog 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1,3 +1,14 @@
+antlr-maven-plugin (2.2-1) experimental; urgency=low
+
+ * Team upload.
+ * New upstream release
+ * Refreshed the patch
+ * Added a dependency on libcommons-exec-java
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * debian/copyright: Updated the Format URI to the version 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 26 Apr 2013 10:39:56 +0200
+
antlr-maven-plugin (2.1-2) unstable; urgency=low
* Team upload.
Modified: trunk/antlr-maven-plugin/debian/control
===================================================================
--- trunk/antlr-maven-plugin/debian/control 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/control 2013-04-26 08:53:22 UTC (rev 16572)
@@ -2,15 +2,17 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Torsten Werner <twerner at debian.org>,
+ Emmanuel Bourg <ebourg at apache.org>
Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>> 0.7)
Build-Depends-Indep: libmaven-antrun-plugin-java (>= 1.3), libmaven-clean-plugin-java (>= 2.3),
libmaven-compiler-plugin-java (>= 2.0.2), libmaven-invoker-plugin-java (>= 1.3),
libmaven-jar-plugin-java (>= 2.2), libmaven-resources-plugin-java (>= 2.3),
libmaven-site-plugin-java (>= 2.0), libmodello-maven-plugin-java (>= 1.1),
libsurefire-java (>= 2.4.3), libmaven-reporting-impl-java, libmaven2-core-java,
- libplexus-i18n-java, libplexus-utils-java, libwagon-java, libmaven-plugin-tools-java
-Standards-Version: 3.9.2
+ libplexus-i18n-java, libplexus-utils-java, libwagon-java, libmaven-plugin-tools-java,
+ libcommons-exec-java
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr-maven-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr-maven-plugin/
Homepage: http://mojo.codehaus.org/antlr-maven-plugin/
Modified: trunk/antlr-maven-plugin/debian/copyright
===================================================================
--- trunk/antlr-maven-plugin/debian/copyright 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/copyright 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Maven ANTLR Plugin
Upstream-Contact: Codehaus developers, Vincent Siveton <vsiveton at apache.org>
Source: http://mojo.codehaus.org/antlr-maven-plugin/
Modified: trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms
===================================================================
--- trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
pom.xml --no-parent
Modified: trunk/antlr-maven-plugin/debian/maven.ignoreRules
===================================================================
--- trunk/antlr-maven-plugin/debian/maven.ignoreRules 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/maven.ignoreRules 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1 +1,2 @@
-org.apache.maven.plugin-testing maven-plugin-testing-harness * *
+
+org.apache.maven.plugin-testing maven-plugin-testing-harness * * * *
Modified: trunk/antlr-maven-plugin/debian/maven.rules
===================================================================
--- trunk/antlr-maven-plugin/debian/maven.rules 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/maven.rules 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1,4 +1,8 @@
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ *
+
+org.apache.maven.reporting maven-reporting-impl jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-provider-api jar s/.*/debian/ * *
+org.codehaus.plexus plexus-i18n jar s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
Modified: trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch
===================================================================
--- trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch 2013-04-25 23:07:52 UTC (rev 16571)
+++ trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch 2013-04-26 08:53:22 UTC (rev 16572)
@@ -1,8 +1,6 @@
-Index: antlr-maven-plugin-2.1/pom.xml
-===================================================================
---- antlr-maven-plugin-2.1.orig/pom.xml 2008-03-06 21:57:20.000000000 +0000
-+++ antlr-maven-plugin-2.1/pom.xml 2012-01-10 16:08:31.000000000 +0000
-@@ -151,7 +151,7 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -132,7 +132,7 @@
</executions>
<configuration>
<version>1.0.0</version>
@@ -10,18 +8,9 @@
+ <models><model>src/main/mdo/antlrOptions.mdo</model></models>
</configuration>
</plugin>
- <plugin>
-@@ -243,4 +243,4 @@
- </build>
- </profile>
- </profiles>
--</project>
-\ No newline at end of file
-+</project>
-Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
-===================================================================
---- antlr-maven-plugin-2.1.orig/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2008-02-25 08:31:17.000000000 +0000
-+++ antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java 2012-01-10 16:58:24.000000000 +0000
+ </plugins>
+--- a/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
++++ b/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
@@ -25,8 +25,8 @@
import java.util.List;
import java.util.Locale;
@@ -32,7 +21,7 @@
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-@@ -218,20 +218,11 @@
+@@ -217,20 +217,11 @@
{
try
{
@@ -55,16 +44,3 @@
catch ( MavenReportException e )
{
throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
-Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java
-===================================================================
---- antlr-maven-plugin-2.1.orig/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java 2008-02-25 08:31:17.000000000 +0000
-+++ antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java 2012-01-10 16:08:31.000000000 +0000
-@@ -82,7 +82,7 @@
- /**
- * The maven project's helper.
- *
-- * @parameter expression="${component.org.apache.maven.project.MavenProjectHelper}"
-+ * @component role="org.apache.maven.project.MavenProjectHelper"
- * @required
- * @readonly
- */
More information about the pkg-java-commits
mailing list