[SCM] libcofoja-java packaging branch, master, updated. upstream/1.0_r139-18-g1fdf6ef

[Olivier Sallou]

The following commit has been merged in the master branch:
commit 4b9d39ab54f13cce3ebf9115d5dd700fbab07c0a
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Wed May 1 12:04:53 2013 +0200

    close bug for UTF encoding and VCS fields

diff --git a/debian/changelog b/debian/changelog
index 746e645..97159d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cofoja (1.0~r139-2) UNRELEASED; urgency=low
+
+  * debian/control : Fix VCS fields  (Closes: #706422)
+  * Fix unmappable characters preventing JDK 7 build (Closes:  #706419)
+      Thanks to Colin Watson <cjwatson at ubuntu.com>
+
+ -- Olivier Sallou <osallou at debian.org>  Wed, 01 May 2013 11:57:38 +0200
+
 cofoja (1.0~r139-1) unstable; urgency=low
 
   * Initial release (Closes: #705128)
diff --git a/debian/control b/debian/control
index 08e7e60..a6c3cc9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 8.0.0), default-jdk, libasm3-java,
  javahelper (>=0.25), junit4, ant
 Standards-Version: 3.9.4
 Homepage: https://code.google.com/p/cofoja/
-Vcs-Git: git://git.debian.org/pkg-java/cofoja.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/cofoja.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-java/libcofoja-java.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libcofoja-java.git;a=summary
 
 Package: libcofoja-java
 Architecture: all
diff --git a/debian/patches/encoding b/debian/patches/encoding
new file mode 100644
index 0000000..9c3b191
--- /dev/null
+++ b/debian/patches/encoding
@@ -0,0 +1,51 @@
+Description: Force encoding to UTF-8
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-04-30
+--- a/build.xml
++++ b/build.xml
+@@ -93,7 +93,7 @@
+       <mkdir dir="${obj.dir}/tmp@{stage}" />
+       <mkdir dir="${obj.dir}/stage@{stage}" />
+       <javac srcdir="${src.dir}" destdir="${obj.dir}/tmp@{stage}"
+-             debug="true" includeantruntime="false">
++             debug="true" includeantruntime="false" encoding="UTF-8">
+         <classpath refid="base.class.path" />
+         <compilerarg value="-processorpath" />
+         <compilerarg value="@{bootstrappath}:${asm.jar}" />
+@@ -148,7 +148,7 @@
+     <mkdir dir="${obj.dir}/bare" />
+     <javac srcdir="${src.dir}" destdir="${obj.dir}/bare"
+            debug="${debug}"
+-           includeantruntime="false">
++           includeantruntime="false" encoding="UTF-8">
+       <classpath refid="base.class.path" />
+     </javac>
+   </target>
+@@ -165,7 +165,7 @@
+     <requirejar property="bootstrap.jar" />
+     <mkdir dir="${obj.dir}/build" />
+     <javac srcdir="${build.dir}" destdir="${obj.dir}/build"
+-           debug="true" includeantruntime="false">
++           debug="true" includeantruntime="false" encoding="UTF-8">
+       <classpath>
+         <path refid="base.class.path" />
+         <pathelement path="${java.class.path}" />
+@@ -202,7 +202,7 @@
+     <requirejar property="junit.jar" />
+     <mkdir dir="${obj.dir}/test" />
+     <javac srcdir="${test.dir}" destdir="${obj.dir}/test"
+-           debug="true" includeantruntime="false">
++           debug="true" includeantruntime="false" encoding="UTF-8">
+       <classpath>
+         <path refid="test.class.path" />
+         <pathelement path="${obj.dir}/stage2" />
+@@ -216,7 +216,7 @@
+ 
+   <target name="buildtest2" depends="buildtest1,stage2">
+     <javac srcdir="${test.dir}" destdir="${obj.dir}/test"
+-           debug="true" includeantruntime="false">
++           debug="true" includeantruntime="false" encoding="UTF-8">
+       <classpath>
+         <path refid="test.class.path" />
+         <pathelement path="${obj.dir}/stage2" />
diff --git a/debian/patches/series b/debian/patches/series
index a2e1c87..cc1d41c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_version_from_generated_jar
+encoding

-- 
libcofoja-java packaging