[pkg-java] r15524 - in trunk/bcel/debian: . patches

[Tony Mancill]

Author: tmancill
Date: 2011-12-12 00:39:16 +0000 (Mon, 12 Dec 2011)
New Revision: 15524

Added:
   trunk/bcel/debian/ant.properties
   trunk/bcel/debian/patches/encoding.patch
Modified:
   trunk/bcel/debian/changelog
   trunk/bcel/debian/control
   trunk/bcel/debian/patches/series
Log:
updates for #651146, #634835

Added: trunk/bcel/debian/ant.properties
===================================================================
--- trunk/bcel/debian/ant.properties	                        (rev 0)
+++ trunk/bcel/debian/ant.properties	2011-12-12 00:39:16 UTC (rev 15524)
@@ -0,0 +1,4 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5

Modified: trunk/bcel/debian/changelog
===================================================================
--- trunk/bcel/debian/changelog	2011-12-10 07:29:08 UTC (rev 15523)
+++ trunk/bcel/debian/changelog	2011-12-12 00:39:16 UTC (rev 15524)
@@ -1,12 +1,22 @@
-bcel (5.2-9) UNRELEASED; urgency=low
+bcel (5.2-9) unstable; urgency=low
 
+  * Team upload.
+
+  [Ludovic Claude]
   * Add version constraint on newer maven-repo-helper
   * d/rules: use mh_install instead of mh_installpoms + mh_installjar
   * Add --has-package-version switch in libbcel-java.poms and other
     options for mh_install
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 03 Dec 2010 23:16:07 +0200
+  [tony mancill]
+  * Apply patch to address FTBFS on JDK7 (Closes: #651146)
+    - Thank you to James Page.
+  * Fix Vcs-Browser field (Closes: #634835)
+  * Bumped Standards-Version to 3.9.2 - no changes required.
+  * Upload to unstable.
 
+ -- tony mancill <tmancill at debian.org>  Fri, 09 Dec 2011 17:09:27 -0800
+
 bcel (5.2-8) experimental; urgency=low
 
   * Team upload.

Modified: trunk/bcel/debian/control
===================================================================
--- trunk/bcel/debian/control	2011-12-10 07:29:08 UTC (rev 15523)
+++ trunk/bcel/debian/control	2011-12-12 00:39:16 UTC (rev 15524)
@@ -5,10 +5,10 @@
 Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
 Build-Depends-Indep: maven-repo-helper (>= 1.5), default-jdk, default-jdk-doc, javahelper (>= 0.32~)
 Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 7)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://jakarta.apache.org/bcel/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bcel
-Vcs-Browser: http://wsvn.debian.org/svn/pkg-java/trunk/bcel/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/bcel/
 
 Package: libbcel-java
 Architecture: all

Added: trunk/bcel/debian/patches/encoding.patch
===================================================================
--- trunk/bcel/debian/patches/encoding.patch	                        (rev 0)
+++ trunk/bcel/debian/patches/encoding.patch	2011-12-12 00:39:16 UTC (rev 15524)
@@ -0,0 +1,33 @@
+Description: Fix encoding of source files for Java 7 compatibility
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: bcel/build.xml
+===================================================================
+--- bcel.orig/build.xml	2011-12-05 14:50:45.203906796 +0000
++++ bcel/build.xml	2011-12-05 14:51:00.535956116 +0000
+@@ -39,7 +39,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="ISO-8859-1">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -100,7 +100,7 @@
+     </property>
+     <property name="title" value="jakarta-bcel 5.2 API">
+     </property>
+-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*">
++    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1">
+       <classpath>
+         <path refid="build.classpath">
+         </path>
+@@ -116,4 +116,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>

Modified: trunk/bcel/debian/patches/series
===================================================================
--- trunk/bcel/debian/patches/series	2011-12-10 07:29:08 UTC (rev 15523)
+++ trunk/bcel/debian/patches/series	2011-12-12 00:39:16 UTC (rev 15524)
@@ -1,3 +1,4 @@
 linkjavadoc.patch
 build.xml.patch
 manifest.patch
+encoding.patch