This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository antlr-maven-plugin.
commit e7b80648d9dc09515068351282abdbe810bf99b1 Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 26 08:53:22 2013 +0000 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 --- debian/changelog | 11 ++++++++++ debian/control | 8 ++++--- debian/copyright | 2 +- debian/libantlr-maven-plugin-java.poms | 27 ++++++++++++++++++++++++ debian/maven.ignoreRules | 3 ++- debian/maven.rules | 12 +++++++---- debian/patches/modello-1.1.patch | 38 +++++++--------------------------- 7 files changed, 61 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6635428..d8729e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Fri, 26 Apr 2013 10:39:56 +0200 + antlr-maven-plugin (2.1-2) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 88a1281..75d418f 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,17 @@ Source: antlr-maven-plugin Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Ludovic Claude <[email protected]>, Torsten Werner <[email protected]> +Uploaders: Ludovic Claude <[email protected]>, Torsten Werner <[email protected]>, + Emmanuel Bourg <[email protected]> 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/ diff --git a/debian/copyright b/debian/copyright index 36a84f9..e8613ce 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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 <[email protected]> Source: http://mojo.codehaus.org/antlr-maven-plugin/ diff --git a/debian/libantlr-maven-plugin-java.poms b/debian/libantlr-maven-plugin-java.poms index 43e746b..8545d14 100644 --- a/debian/libantlr-maven-plugin-java.poms +++ b/debian/libantlr-maven-plugin-java.poms @@ -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 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 6967f0c..bb508b1 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1 +1,2 @@ -org.apache.maven.plugin-testing maven-plugin-testing-harness * * + +org.apache.maven.plugin-testing maven-plugin-testing-harness * * * * diff --git a/debian/maven.rules b/debian/maven.rules index ffeb6c0..a942cf0 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -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/ * * diff --git a/debian/patches/modello-1.1.patch b/debian/patches/modello-1.1.patch index 6852dad..15f7368 100644 --- a/debian/patches/modello-1.1.patch +++ b/debian/patches/modello-1.1.patch @@ -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 @@ Index: antlr-maven-plugin-2.1/pom.xml + <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 @@ Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlRep 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 @@ Index: antlr-maven-plugin-2.1/src/main/java/org/codehaus/mojo/antlr/AntlrHtmlRep 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 - */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
