Tags: patch

Greetings all,

I have confirmed this bug is related to source file encoding.
I believe I have fixed this in the attached patch.

Please review - this is my first debian bug fix.

Thanks,
Dean
diff -Nru bouncycastle-1.49+dfsg/debian/changelog 
bouncycastle-1.49+dfsg/debian/changelog
--- bouncycastle-1.49+dfsg/debian/changelog     2014-10-22 21:41:06.000000000 
+1000
+++ bouncycastle-1.49+dfsg/debian/changelog     2015-10-11 11:01:38.000000000 
+1000
@@ -1,3 +1,10 @@
+bouncycastle (1.49+dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * bc+-build.xml: Added javac encoding=UTF-8 (Closes: #798343) 
+
+ -- dean <deanshan...@gmail.com>  Sun, 11 Oct 2015 10:56:33 +1000
+
 bouncycastle (1.49+dfsg-3) unstable; urgency=medium
 
   * Replaced the dependency on libgnumail-java with libmail-java
diff -Nru bouncycastle-1.49+dfsg/debian/patches/fix-encoding.patch 
bouncycastle-1.49+dfsg/debian/patches/fix-encoding.patch
--- bouncycastle-1.49+dfsg/debian/patches/fix-encoding.patch    1970-01-01 
10:00:00.000000000 +1000
+++ bouncycastle-1.49+dfsg/debian/patches/fix-encoding.patch    2015-10-11 
12:14:23.000000000 +1000
@@ -0,0 +1,44 @@
+Index: bouncycastle/bc+-build.xml
+===================================================================
+--- bouncycastle.orig/bc+-build.xml
++++ bouncycastle/bc+-build.xml
+@@ -95,7 +95,8 @@
+                 <javac source="${bc.javac.source}" target="${bc.javac.target}"
+                     srcdir="${artifacts.dir}/@{target}/src"
+                     destdir="${build.dir}/@{target}/classes"
+-                    debug="${release.debug}">
++                    debug="${release.debug}"
++                  encoding="UTF-8">
+                     <classpath>
+                         <fileset dir="${artifacts.jars.dir}">
+                             <include name="**/*.jar" />
+@@ -130,7 +131,8 @@
+                 <javac source="${bc.javac.source}" target="${bc.javac.target}"
+                     srcdir="${artifacts.dir}/@{target}/src"
+                     destdir="${build.dir}/@{target}/classes"
+-                    debug="${release.debug}">
++                    debug="${release.debug}"
++                  encoding="UTF-8">
+                     <classpath>
+                         <fileset dir="${artifacts.jars.dir}">
+                             <include name="**/*.jar" />
+@@ -190,7 +192,8 @@
+             <javadoc sourcepath="@{srcDir}"
+                      destdir="@{docsDir}"
+                      windowtitle="Bouncy Castle Library ${release.name} API 
Specification"
+-                     header="&lt;b&gt;Bouncy Castle Cryptography Library 
${release.name}&lt;/b&gt;">
++                     header="&lt;b&gt;Bouncy Castle Cryptography Library 
${release.name}&lt;/b&gt;"
++                   encoding="UTF-8">
+                 <docElements/>
+                 <arg value="${javadoc.args}" />
+                 <classpath>
+@@ -246,7 +249,8 @@
+         <javac source="${bc.javac.source}" target="${bc.javac.target}"
+             srcdir="${lcrypto.target.src.dir}"
+             destdir="${lcrypto.target.classes.dir}"
+-            debug="${release.debug}">
++            debug="${release.debug}"
++          encoding="UTF-8">
+         </javac>
+     </target>
+ 
diff -Nru bouncycastle-1.49+dfsg/debian/patches/series 
bouncycastle-1.49+dfsg/debian/patches/series
--- bouncycastle-1.49+dfsg/debian/patches/series        2014-10-22 
21:21:21.000000000 +1000
+++ bouncycastle-1.49+dfsg/debian/patches/series        2015-10-11 
11:04:00.000000000 +1000
@@ -1,2 +1,3 @@
 01_build.patch
 02_index.patch
+fix-encoding.patch

Attachment: signature.asc
Description: OpenPGP digital signature

__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to