[bnd] 03/09: Fixed the unmappable character errors during the compilation

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to annotated tag debian/1.50.0-6
in repository bnd.

commit bf4e88ec26dec6f9dd1c44e9e12d5f07932f0039
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 26 10:12:37 2013 +0000

    Fixed the unmappable character errors during the compilation
---
 debian/bootstrap.xml             |  1 +
 debian/changelog                 |  1 +
 debian/patches/fix-encoding.diff | 11 +++++++++++
 debian/patches/series            |  1 +
 4 files changed, 14 insertions(+)

diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
index 6bc7ae5..6c76c60 100644
--- a/debian/bootstrap.xml
+++ b/debian/bootstrap.xml
@@ -11,6 +11,7 @@
         <javac
                 destdir="bootstrap/build"
                 classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar"
+                encoding="UTF-8"
                 debug="true">
             <src path="aQute.libg/src"/>
             <src path="biz.aQute.bndlib/src"/>
diff --git a/debian/changelog b/debian/changelog
index 8203157..9ea6784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bnd (1.50.0-6) UNRELEASED; urgency=low
   * debian/watch: Updated to catch the recent releases on Github
   * debian/control: Updated Standards-Version to 3.9.4 (no changes)
   * debian/rules: Improved the clean target
+  * Fixed the unmappable character errors during the compilation
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 26 Jul 2013 11:28:27 +0200
 
diff --git a/debian/patches/fix-encoding.diff b/debian/patches/fix-encoding.diff
new file mode 100644
index 0000000..92925f3
--- /dev/null
+++ b/debian/patches/fix-encoding.diff
@@ -0,0 +1,11 @@
+--- a/cnf/build.xml
++++ b/cnf/build.xml
+@@ -49,7 +49,7 @@
+ 	-->
+ 	<target name="compile" depends="dependencies" if="project.sourcepath">
+ 		<mkdir dir="${project.output}" />
+-		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" />
++		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}" classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}" excludes="${javac.excludes}" encoding="UTF-8"/>
+ 		<!-- 
+ 		  The eclipse compiler copies resources but the Javac compiler does not
+ 		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
diff --git a/debian/patches/series b/debian/patches/series
index fb476eb..66cc135 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no_git_during_build.diff
 osgi43_fixes.diff
 display_bsn_on_missing_bundle.diff
 find_swt_jar.diff
+fix-encoding.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git