[css2xslfo] 06/13: Pass -encoding instead of setting LANG.

Tristan Seligmann mithrandi at moszumanska.debian.org
Sun Jan 19 14:33:05 UTC 2014


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

mithrandi pushed a commit to branch master
in repository css2xslfo.

commit 7a849ae4ffcbefc95da99d0ca455c6da90be6d21
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Sun Jan 19 14:59:50 2014 +0200

    Pass -encoding instead of setting LANG.
---
 debian/patches/series              |  1 +
 debian/patches/set-source-encoding | 20 ++++++++++++++++++++
 debian/rules                       |  3 ---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index cdcbbfb..f272974 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-ant-webdav-stuff
 build-modified-libs
+set-source-encoding
diff --git a/debian/patches/set-source-encoding b/debian/patches/set-source-encoding
new file mode 100644
index 0000000..7f353ce
--- /dev/null
+++ b/debian/patches/set-source-encoding
@@ -0,0 +1,20 @@
+Description: Set source encoding
+ Some source files are in UTF-8, so we need to pass the correct encoding to
+ javac.
+Author: Tristan Seligmann <mithrandi at debian.org>
+Last-Update: 2014-01-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: css2xslfo/build.xml
+===================================================================
+--- css2xslfo.orig/build.xml	2014-01-19 14:56:24.706273910 +0200
++++ css2xslfo/build.xml	2014-01-19 14:59:08.340987205 +0200
+@@ -40,7 +40,7 @@
+   </target>
+ 
+   <target name="compile-css2xslfo" depends="init">
+-    <javac debug="on" debuglevel="lines,vars,source" srcdir="src:lib_src/sac:lib_src/flute" destdir="classes">
++    <javac debug="on" debuglevel="lines,vars,source" srcdir="src:lib_src/sac:lib_src/flute" destdir="classes" encoding="UTF-8">
+       <classpath>
+         <fileset refid="compile-classpath" />
+       </classpath>
diff --git a/debian/rules b/debian/rules
index 4d37a1b..6640544 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-# Build with UTF-8, because of UTF-8 source files
-export LANG=C.UTF-8
-
 %:
 	dh $@ --with javahelper
 

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



More information about the pkg-java-commits mailing list