[pkg-java] r16149 - in trunk/asm2/debian: . patches

[Niels Thykier]

Author: nthykier
Date: 2012-06-19 08:50:59 +0000 (Tue, 19 Jun 2012)
New Revision: 16149

Added:
   trunk/asm2/debian/patches/encoding.patch
Modified:
   trunk/asm2/debian/changelog
   trunk/asm2/debian/patches/series
Log:
Fix encoding issue with Java7

Modified: trunk/asm2/debian/changelog
===================================================================
--- trunk/asm2/debian/changelog	2012-06-19 08:37:21 UTC (rev 16148)
+++ trunk/asm2/debian/changelog	2012-06-19 08:50:59 UTC (rev 16149)
@@ -3,6 +3,7 @@
   * Team upload.
   * Recommend default-jdk-doc instead of depending on specific
     javadoc providing packages.  (Closes: #567266)
+  * Fix encoding issue with Java7.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 19 Jun 2012 10:29:46 +0200
 

Added: trunk/asm2/debian/patches/encoding.patch
===================================================================
--- trunk/asm2/debian/patches/encoding.patch	                        (rev 0)
+++ trunk/asm2/debian/patches/encoding.patch	2012-06-19 08:50:59 UTC (rev 16149)
@@ -0,0 +1,22 @@
+--- a/build.xml	2012-06-19 08:44:24.842016939 +0000
++++ b/build.xml	2012-06-19 08:46:48.618048417 +0000
+@@ -128,7 +128,7 @@
+ 
+   <target name="compile-debug" depends="init">
+     <mkdir dir="${out.build}/tmp"/>
+-    <javac destdir="${out.build}/tmp" debug="on" source="1.3" target="1.2">
++    <javac destdir="${out.build}/tmp" debug="on" source="1.3" target="1.2" encoding="ISO-8859-1">
+       <classpath>
+         <pathelement location="${out.build}/tmp"/>
+       </classpath>
+--- a/jdoc/user.xml	2012-06-19 08:46:36.402386170 +0000
++++ b/jdoc/user.xml	2012-06-19 08:46:45.454135905 +0000
+@@ -14,7 +14,7 @@
+     <mkdir dir="${jdoc.dir}"/>
+     <javadoc destdir="${jdoc.dir}"
+              windowtitle="ASM Documentation"
+-             doctitle="ASM Documentation">
++             doctitle="ASM Documentation" encoding="ISO-8859-1">
+ 
+       <sourcepath path="${src}"/>
+       <package name="org.objectweb.asm"/>

Modified: trunk/asm2/debian/patches/series
===================================================================
--- trunk/asm2/debian/patches/series	2012-06-19 08:37:21 UTC (rev 16148)
+++ trunk/asm2/debian/patches/series	2012-06-19 08:50:59 UTC (rev 16149)
@@ -1 +1,2 @@
 build.patch
+encoding.patch