[pkg-java] r16987 - in tags/antlr-maven-plugin: . 2.2-2/debian 2.2-2/debian/patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-04 12:31:04 +0000 (Thu, 04 Jul 2013)
New Revision: 16987

Added:
   tags/antlr-maven-plugin/2.2-2/
   tags/antlr-maven-plugin/2.2-2/debian/changelog
   tags/antlr-maven-plugin/2.2-2/debian/patches/null-options-check.patch
   tags/antlr-maven-plugin/2.2-2/debian/patches/series
Removed:
   tags/antlr-maven-plugin/2.2-2/debian/changelog
   tags/antlr-maven-plugin/2.2-2/debian/patches/series
Log:
[svn-buildpackage] Tagging antlr-maven-plugin 2.2-2

Deleted: tags/antlr-maven-plugin/2.2-2/debian/changelog
===================================================================
--- trunk/antlr-maven-plugin/debian/changelog	2013-07-03 14:48:21 UTC (rev 16985)
+++ tags/antlr-maven-plugin/2.2-2/debian/changelog	2013-07-04 12:31:04 UTC (rev 16987)
@@ -1,35 +0,0 @@
-antlr-maven-plugin (2.2-1) unstable; urgency=low
-
-  * 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
-  * Use canonical URLs for the Vcs-* fields
-  * Added a lintian override for the javalib-but-no-public-jars warning
-
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Jul 2013 14:40:27 +0200
-
-antlr-maven-plugin (2.1-2) unstable; urgency=low
-
-  * Team upload.
-  * 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 <miguel at miguel.cc>  Wed, 11 Jan 2012 22:54:32 -0430
-
-antlr-maven-plugin (2.1-1) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Initial release (Closes: #567815)
-
-  [ Torsten Werner ]
-  * Add myself to Uploaders.
-  * Fix debian/watch and debian/copyright.
-  * Switch to source format 3.0.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 19 May 2010 22:30:21 +0200

Copied: tags/antlr-maven-plugin/2.2-2/debian/changelog (from rev 16986, trunk/antlr-maven-plugin/debian/changelog)
===================================================================
--- tags/antlr-maven-plugin/2.2-2/debian/changelog	                        (rev 0)
+++ tags/antlr-maven-plugin/2.2-2/debian/changelog	2013-07-04 12:31:04 UTC (rev 16987)
@@ -0,0 +1,42 @@
+antlr-maven-plugin (2.2-2) unstable; urgency=low
+
+  * Added a patch to fix a NPE when the grammar options are null
+    (http://jira.codehaus.org/browse/MANTLR-34)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Jul 2013 10:27:52 +0200
+
+antlr-maven-plugin (2.2-1) unstable; urgency=low
+
+  * 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
+  * Use canonical URLs for the Vcs-* fields
+  * Added a lintian override for the javalib-but-no-public-jars warning
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Jul 2013 14:40:27 +0200
+
+antlr-maven-plugin (2.1-2) unstable; urgency=low
+
+  * Team upload.
+  * 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 <miguel at miguel.cc>  Wed, 11 Jan 2012 22:54:32 -0430
+
+antlr-maven-plugin (2.1-1) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * Initial release (Closes: #567815)
+
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Fix debian/watch and debian/copyright.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 19 May 2010 22:30:21 +0200

Copied: tags/antlr-maven-plugin/2.2-2/debian/patches/null-options-check.patch (from rev 16986, trunk/antlr-maven-plugin/debian/patches/null-options-check.patch)
===================================================================
--- tags/antlr-maven-plugin/2.2-2/debian/patches/null-options-check.patch	                        (rev 0)
+++ tags/antlr-maven-plugin/2.2-2/debian/patches/null-options-check.patch	2013-07-04 12:31:04 UTC (rev 16987)
@@ -0,0 +1,15 @@
+Description: Fixed a NPE when the grammar options are null
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: yes
+Bug: http://jira.codehaus.org/browse/MANTLR-34
+--- a/src/main/java/org/codehaus/mojo/antlr/metadata/MetadataExtracter.java
++++ b/src/main/java/org/codehaus/mojo/antlr/metadata/MetadataExtracter.java
+@@ -239,6 +239,8 @@
+             Method getRHSMethod = helper.getAntlrOptionClass().getMethod( "getRHS", Helper.NO_ARG_SIGNATURE );
+             getRHSMethod.setAccessible( true );
+ 
++            if (options == null) return;
++
+             Object importVocabOption = getElementMethod.invoke( options, new Object[] { "importVocab" } );
+             if ( importVocabOption != null )
+             {

Deleted: tags/antlr-maven-plugin/2.2-2/debian/patches/series
===================================================================
--- trunk/antlr-maven-plugin/debian/patches/series	2013-07-03 14:48:21 UTC (rev 16985)
+++ tags/antlr-maven-plugin/2.2-2/debian/patches/series	2013-07-04 12:31:04 UTC (rev 16987)
@@ -1 +0,0 @@
-modello-1.1.patch

Copied: tags/antlr-maven-plugin/2.2-2/debian/patches/series (from rev 16986, trunk/antlr-maven-plugin/debian/patches/series)
===================================================================
--- tags/antlr-maven-plugin/2.2-2/debian/patches/series	                        (rev 0)
+++ tags/antlr-maven-plugin/2.2-2/debian/patches/series	2013-07-04 12:31:04 UTC (rev 16987)
@@ -0,0 +1,2 @@
+null-options-check.patch
+modello-1.1.patch