Author: ludovicc-guest Date: 2010-01-31 19:17:33 +0000 (Sun, 31 Jan 2010) New Revision: 11477
Added: trunk/antlr-maven-plugin/.debianVersion trunk/antlr-maven-plugin/debian/ trunk/antlr-maven-plugin/debian/README.source trunk/antlr-maven-plugin/debian/changelog trunk/antlr-maven-plugin/debian/compat 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.properties trunk/antlr-maven-plugin/debian/maven.rules trunk/antlr-maven-plugin/debian/orig-tar.sh trunk/antlr-maven-plugin/debian/patches/ trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch trunk/antlr-maven-plugin/debian/patches/series trunk/antlr-maven-plugin/debian/rules trunk/antlr-maven-plugin/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Added: trunk/antlr-maven-plugin/.debianVersion =================================================================== --- trunk/antlr-maven-plugin/.debianVersion (rev 0) +++ trunk/antlr-maven-plugin/.debianVersion 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +2.1-1 \ No newline at end of file Property changes on: trunk/antlr-maven-plugin/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Added: trunk/antlr-maven-plugin/debian/README.source =================================================================== --- trunk/antlr-maven-plugin/debian/README.source (rev 0) +++ trunk/antlr-maven-plugin/debian/README.source 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,9 @@ +Information about antlr-maven-plugin +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. Added: trunk/antlr-maven-plugin/debian/changelog =================================================================== --- trunk/antlr-maven-plugin/debian/changelog (rev 0) +++ trunk/antlr-maven-plugin/debian/changelog 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,5 @@ +antlr-maven-plugin (2.1-0ubuntu1~ppa7) karmic; urgency=low + + * Initial release (Closes: #567815) + + -- Ludovic Claude <[email protected]> Mon, 18 Jan 2010 22:18:03 +0100 Added: trunk/antlr-maven-plugin/debian/compat =================================================================== --- trunk/antlr-maven-plugin/debian/compat (rev 0) +++ trunk/antlr-maven-plugin/debian/compat 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +7 Added: trunk/antlr-maven-plugin/debian/control =================================================================== --- trunk/antlr-maven-plugin/debian/control (rev 0) +++ trunk/antlr-maven-plugin/debian/control 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,26 @@ +Source: antlr-maven-plugin +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Ludovic Claude <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, quilt, 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 +Standards-Version: 3.8.3 +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/ + +Package: libantlr-maven-plugin-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Description: Maven ANTLR Plugin + Maven Plugin for Antlr v2. It can generate code from Antlr 2 scripts + inside a Maven build. + + Added: trunk/antlr-maven-plugin/debian/copyright =================================================================== --- trunk/antlr-maven-plugin/debian/copyright (rev 0) +++ trunk/antlr-maven-plugin/debian/copyright 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,17 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: Maven ANTLR Plugin +Maintainer: Codehaus developers, Vincent Siveton <[email protected]> +Source: http://mojo.codehaus.org/antlr-maven-plugin/ + +Files: * +Copyright: 2004-2010, Vincent Siveton <[email protected]> +License: Apache-2.0 + +Files: debian/* +Copyright: 2010, Ludovic Claude <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' + Added: trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms =================================================================== --- trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms (rev 0) +++ trunk/antlr-maven-plugin/debian/libantlr-maven-plugin-java.poms 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +pom.xml --no-parent Added: trunk/antlr-maven-plugin/debian/maven.ignoreRules =================================================================== --- trunk/antlr-maven-plugin/debian/maven.ignoreRules (rev 0) +++ trunk/antlr-maven-plugin/debian/maven.ignoreRules 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +org.apache.maven.plugin-testing maven-plugin-testing-harness * * Added: trunk/antlr-maven-plugin/debian/maven.properties =================================================================== --- trunk/antlr-maven-plugin/debian/maven.properties (rev 0) +++ trunk/antlr-maven-plugin/debian/maven.properties 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +maven.test.skip=true Added: trunk/antlr-maven-plugin/debian/maven.rules =================================================================== --- trunk/antlr-maven-plugin/debian/maven.rules (rev 0) +++ trunk/antlr-maven-plugin/debian/maven.rules 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,4 @@ +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/ * Added: trunk/antlr-maven-plugin/debian/orig-tar.sh =================================================================== --- trunk/antlr-maven-plugin/debian/orig-tar.sh (rev 0) +++ trunk/antlr-maven-plugin/debian/orig-tar.sh 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,16 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../antlr-maven-plugin_$VERSION.orig.tar.gz +DIR=antlr-maven-plugin-$VERSION +TAG=$(echo "antlr-maven-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') + +svn export https://svn.codehaus.org/mojo/tags/${TAG}/ $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +rm -rf $DIR ../$TAG + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir && echo "moved $TAR to $origDir" +fi Added: trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch =================================================================== --- trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch (rev 0) +++ trunk/antlr-maven-plugin/debian/patches/modello-1.1.patch 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,68 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -151,7 +151,7 @@ + </executions> + <configuration> + <version>1.0.0</version> +- <model>src/main/mdo/antlrOptions.mdo</model> ++ <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> +--- a/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java ++++ b/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlReport.java +@@ -26,13 +26,13 @@ + import java.util.Locale; + + 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 @@ + { + try + { +- SiteRendererSink sink = siteRenderer.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); ++ SiteRendererSink sink = SinkFactory.createSink( getReportOutputDirectory(), getOutputName() + ".html" ); + + generate( sink, Locale.getDefault() ); + } +- catch ( RendererException e ) +- { +- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) +- + " report generation.", e ); +- } +- catch ( IOException e ) +- { +- throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) +- + " report generation.", e ); +- } + 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 +@@ -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 + */ Added: trunk/antlr-maven-plugin/debian/patches/series =================================================================== --- trunk/antlr-maven-plugin/debian/patches/series (rev 0) +++ trunk/antlr-maven-plugin/debian/patches/series 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1 @@ +modello-1.1.patch Added: trunk/antlr-maven-plugin/debian/rules =================================================================== --- trunk/antlr-maven-plugin/debian/rules (rev 0) +++ trunk/antlr-maven-plugin/debian/rules 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,10 @@ +#!/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 + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Property changes on: trunk/antlr-maven-plugin/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/antlr-maven-plugin/debian/watch =================================================================== --- trunk/antlr-maven-plugin/debian/watch (rev 0) +++ trunk/antlr-maven-plugin/debian/watch 2010-01-31 19:17:33 UTC (rev 11477) @@ -0,0 +1,4 @@ +version=3 +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + https://svn.codehaus.org/mojo/tags/ \ + antlr-maven-plugin-(\d.*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
