[pkg-java] r16191 - in trunk/antlr3/debian: . patches

[James Page]

Author: jamespage-guest
Date: 2012-06-21 15:06:12 +0000 (Thu, 21 Jun 2012)
New Revision: 16191

Added:
   trunk/antlr3/debian/patches/
   trunk/antlr3/debian/patches/java7-compat.patch
   trunk/antlr3/debian/patches/series
Modified:
   trunk/antlr3/debian/changelog
Log:
* Fix FTBFS with openjdk-7:
  - d/patches/java7-compat.patch: Target 1.5 instead of jsr14 which is
    not supported by Java 7.

Modified: trunk/antlr3/debian/changelog
===================================================================
--- trunk/antlr3/debian/changelog	2012-06-21 11:50:48 UTC (rev 16190)
+++ trunk/antlr3/debian/changelog	2012-06-21 15:06:12 UTC (rev 16191)
@@ -1,8 +1,15 @@
 antlr3 (3.2-7) UNRELEASED; urgency=low
 
   * Team upload.
+
+  [ tony mancill ]
   * Remove Michal Koch from Uploaders. (Closes: #653985)
 
+  [ James Page ]
+  * Fix FTBFS with openjdk-7:
+    - d/patches/java7-compat.patch: Target 1.5 instead of jsr14 which is
+      not supported by Java 7.
+
  -- tony mancill <tmancill at debian.org>  Sun, 01 Jan 2012 16:31:42 -0800
 
 antlr3 (3.2-6) unstable; urgency=low

Added: trunk/antlr3/debian/patches/java7-compat.patch
===================================================================
--- trunk/antlr3/debian/patches/java7-compat.patch	                        (rev 0)
+++ trunk/antlr3/debian/patches/java7-compat.patch	2012-06-21 15:06:12 UTC (rev 16191)
@@ -0,0 +1,59 @@
+Description: Target Java 1.5 instead of jsr14 which is not supported
+ by Java 7.
+ .
+ The minimum java version in Debian is 1.5 so this is OK.
+Author: James Page <james.page at ubuntu.com>
+Fowarded: no
+
+Index: antlr3-3.2/antlr3-maven-plugin/pom.xml
+===================================================================
+--- antlr3-3.2.orig/antlr3-maven-plugin/pom.xml	2012-06-21 15:49:21.516762511 +0100
++++ antlr3-3.2/antlr3-maven-plugin/pom.xml	2012-06-21 15:54:04.321701402 +0100
+@@ -332,7 +332,7 @@
+                 <version>2.0.2</version>
+                 <configuration>
+                     <source>1.5</source>
+-                    <target>jsr14</target>
++                    <target>1.5</target>
+                 </configuration>
+             </plugin>
+ 
+Index: antlr3-3.2/gunit/pom.xml
+===================================================================
+--- antlr3-3.2.orig/gunit/pom.xml	2012-06-21 15:49:21.520762523 +0100
++++ antlr3-3.2/gunit/pom.xml	2012-06-21 15:54:10.053720435 +0100
+@@ -133,7 +133,7 @@
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
+                     <source>1.5</source>
+-                    <target>jsr14</target>
++                    <target>1.5</target>
+                     <sourceDirectory>src</sourceDirectory>
+                 </configuration>
+             </plugin>
+Index: antlr3-3.2/pom.xml
+===================================================================
+--- antlr3-3.2.orig/pom.xml	2012-06-21 15:49:21.508762484 +0100
++++ antlr3-3.2/pom.xml	2012-06-21 15:54:13.005730234 +0100
+@@ -169,7 +169,7 @@
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
+                     <source>1.5</source>
+-                    <target>jsr14</target>
++                    <target>1.5</target>
+                     <sourceDirectory>src</sourceDirectory>
+                 </configuration>
+             </plugin>
+Index: antlr3-3.2/runtime/Java/pom.xml
+===================================================================
+--- antlr3-3.2.orig/runtime/Java/pom.xml	2012-06-21 15:49:21.512762498 +0100
++++ antlr3-3.2/runtime/Java/pom.xml	2012-06-21 15:54:18.125747235 +0100
+@@ -100,7 +100,7 @@
+             <version>2.0.2</version>
+             <configuration>
+                 <source>1.5</source>
+-                <target>jsr14</target>
++                <target>1.5</target>
+             </configuration>
+         </plugin>
+ 

Added: trunk/antlr3/debian/patches/series
===================================================================
--- trunk/antlr3/debian/patches/series	                        (rev 0)
+++ trunk/antlr3/debian/patches/series	2012-06-21 15:06:12 UTC (rev 16191)
@@ -0,0 +1 @@
+java7-compat.patch