[SCM] uddi4j packaging branch, master, updated. debian/2.0.5-1-1-gee3ef3d

Niels Thykier niels at thykier.net
Mon Jun 18 13:11:04 UTC 2012


The following commit has been merged in the master branch:
commit ee3ef3d451abb60095b181d1adfac719d52afa09
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jun 18 15:03:40 2012 +0200

    Explicitly specific the encoding of the Java files
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 6fca558..fbc9d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+uddi4j (2.0.5-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Specific the encoding in the java files to fix FTBFS with
+    Java7.  Thanks to Ilya Barygin for the report and the initial
+    patch.  (Closes: #677837, LP: #1009480)
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 18 Jun 2012 15:01:30 +0200
+
 uddi4j (2.0.5-1) unstable; urgency=low
 
   * Initial release.
diff --git a/debian/patches/build.xml-encoding.patch b/debian/patches/build.xml-encoding.patch
new file mode 100644
index 0000000..9dab8ce
--- /dev/null
+++ b/debian/patches/build.xml-encoding.patch
@@ -0,0 +1,24 @@
+Description: fix FTBFS with java 7
+Author: Ilya Barygin <randomaction at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1009480
+
+diff --git a/build.xml b/build.xml
+index 1a183f5..9a89aef 100644
+--- a/build.xml
++++ b/build.xml
+@@ -152,6 +152,7 @@ Authors:
+     <javac	fork="yes"
+     		executable="${javac.executable}"
+     		deprecation="true"
++    		encoding="windows-1252"
+     		srcdir="${src.dir}"
+     		destdir="${build.dest}"
+     		debug="${debug}">
+@@ -177,6 +178,7 @@ Authors:
+     <mkdir dir="${build.samples}"/>
+     <javac deprecation="true" srcdir="${samples.dir}" 
+            destdir="${build.samples}" 
++           encoding="windows-1252"
+            debug="${debug}">           
+            <classpath>
+                 <path refid="uddi4j.build.classpath"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f3e74f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.xml-encoding.patch

-- 
uddi4j packaging



More information about the pkg-java-commits mailing list