Author: nomadium-guest
Date: 2012-01-12 04:07:09 +0000 (Thu, 12 Jan 2012)
New Revision: 15691
Modified:
trunk/antlr-maven-plugin/debian/changelog
trunk/antlr-maven-plugin/debian/control
trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch
trunk/antlr-maven-plugin/debian/rules
Log:
* Add Build-Depends on libmaven-plugin-tools-java. (Closes: #655371).
* Refresh modello-1.1.patch. (Closes: #643492).
Thanks to Daniel Schepler for contributing a fix for this bug.
* Drop unnecessary B-D on quilt.
Modified: trunk/antlr-maven-plugin/debian/changelog
===================================================================
--- trunk/antlr-maven-plugin/debian/changelog 2012-01-11 16:58:43 UTC (rev
15690)
+++ trunk/antlr-maven-plugin/debian/changelog 2012-01-12 04:07:09 UTC (rev
15691)
@@ -1,11 +1,14 @@
antlr-maven-plugin (2.1-2) UNRELEASED; urgency=low
* Team upload.
- * Add Build-Depends on libmaven-plugin-tools-java. (Closes: #643492).
+ * Add Build-Depends on libmaven-plugin-tools-java. (Closes: #655371).
+ * Refresh modello-1.1.patch. (Closes: #643492).
+ Thanks to Daniel Schepler for contributing a fix for this bug.
* Bump Standards-Version to 3.9.2. No changes were required.
* Make copyright file DEP-5 compliant.
+ * Drop unnecessary B-D on quilt.
- -- Miguel Landaeta <mig...@miguel.cc> Wed, 12 Oct 2011 15:25:53 -0430
+ -- Miguel Landaeta <mig...@miguel.cc> Wed, 11 Jan 2012 22:54:32 -0430
antlr-maven-plugin (2.1-1) unstable; urgency=low
Modified: trunk/antlr-maven-plugin/debian/control
===================================================================
--- trunk/antlr-maven-plugin/debian/control 2012-01-11 16:58:43 UTC (rev
15690)
+++ trunk/antlr-maven-plugin/debian/control 2012-01-12 04:07:09 UTC (rev
15691)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.cla...@laposte.net>, Torsten Werner
<twer...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk, maven-debian-helper
(>> 0.7)
+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),
Modified: trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch
===================================================================
--- trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch 2012-01-11
16:58:43 UTC (rev 15690)
+++ trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch 2012-01-12
04:07:09 UTC (rev 15691)
@@ -1,5 +1,7 @@
---- a/pom.xml
-+++ b/pom.xml
+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 @@
</executions>
<configuration>
@@ -16,29 +18,27 @@
-</project>
\ No newline at end of file
+</project>
---- a/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
-+++ b/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java
-@@ -26,13 +26,13 @@
+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
+@@ -25,8 +25,8 @@
+ import java.util.List;
import java.util.Locale;
++import org.apache.maven.doxia.sink.render.RenderingContext;
import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.doxia.siterenderer.RendererException;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
- import org.apache.maven.reporting.AbstractMavenReportRenderer;
- import org.apache.maven.reporting.MavenReport;
- import org.apache.maven.reporting.MavenReportException;
-+import org.apache.maven.reporting.sink.SinkFactory;
- import org.apache.maven.wagon.PathUtils;
- import org.codehaus.doxia.sink.Sink;
- import org.codehaus.plexus.i18n.I18N;
-@@ -218,20 +218,10 @@
+@@ -218,20 +218,11 @@
{
try
{
- SiteRendererSink sink = siteRenderer.createSink(
getReportOutputDirectory(), getOutputName() + ".html" );
-+ SiteRendererSink sink = SinkFactory.createSink(
getReportOutputDirectory(), getOutputName() + ".html" );
++ RenderingContext context = new RenderingContext(
getReportOutputDirectory(), getOutputName() + ".html" );
++ SiteRendererSink sink = new SiteRendererSink( context );
generate( sink, Locale.getDefault() );
}
@@ -55,8 +55,10 @@
catch ( MavenReportException e )
{
throw new MojoExecutionException( "An error has occurred in " +
getName( Locale.ENGLISH )
---- a/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java
-+++ b/src/main/java/org/codehaus/mojo/antlr/AbstractAntlrMojo.java
+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.
Modified: trunk/antlr-maven-plugin/debian/rules
===================================================================
--- trunk/antlr-maven-plugin/debian/rules 2012-01-11 16:58:43 UTC (rev
15690)
+++ trunk/antlr-maven-plugin/debian/rules 2012-01-12 04:07:09 UTC (rev
15691)
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
