[SCM] Java datatype interface for RELAX NG branch, master, updated. debian/1.0+ds1-1-2-g91e595b

Giovanni Mascellani mascellani at poisson.phc.unipi.it
Mon Mar 11 20:53:11 UTC 2013


The following commit has been merged in the master branch:
commit 137c584d8f39dc3e02cebe53ed36bdcc1003855b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Mon Mar 11 21:00:20 2013 +0100

    Generate 1.5-compatible Java classes.

diff --git a/debian/changelog b/debian/changelog
index 3c93910..6af2f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librelaxng-datatype-java (1.0+ds1-2) UNRELEASED; urgency=low
+
+  * Force generation of 1.5-compatible Java classes (LP: #1049731).
+
+ -- Giovanni Mascellani <gio at debian.org>  Mon, 11 Mar 2013 21:40:44 +0100
+
 librelaxng-datatype-java (1.0+ds1-1) unstable; urgency=low
 
   * Packaging again after removal (closes: #612443).
diff --git a/debian/patches/generate_1.5_code b/debian/patches/generate_1.5_code
new file mode 100644
index 0000000..20f8cd4
--- /dev/null
+++ b/debian/patches/generate_1.5_code
@@ -0,0 +1,31 @@
+From: Giovanni Mascellani <gio at debian.org>
+Description: Generate 1.5-compatible classes
+ Use the tricks described in https://wiki.ubuntu.com/JavaTeam/Java7Default
+ to generate 1.5-compatible classes.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/librelaxng-datatype-java/+bug/1049731
+Forwarded: no
+Last-Update: 2013-03-11
+
+---
+Index: librelaxng-datatype-java/build.xml
+===================================================================
+--- librelaxng-datatype-java.orig/build.xml	2013-03-11 21:36:46.028457644 +0100
++++ librelaxng-datatype-java/build.xml	2013-03-11 21:38:41.437831056 +0100
+@@ -18,6 +18,9 @@
+ 			destdir="${build.dir}"
+ 			debug="off"
+ 			optimize="on"
++			encoding="ISO-8859-1"
++			target="1.5"
++			source="1.5"
+ 			/>
+ 		
+ 		<!-- generate javadoc documentation -->
+@@ -29,6 +32,7 @@
+ 					windowtitle="RELAX NG Datatype Interface"
+ 					public="yes"
+ 					author="yes"
++					source="1.5"
+ 					>
+ 		</javadoc>
+ 	</target>
diff --git a/debian/patches/series b/debian/patches/series
index 5a5c30d..8b06dab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-upstream-build.xml-with-more-targets-and-standar.patch
+generate_1.5_code

-- 
Java datatype interface for RELAX NG



More information about the pkg-java-commits mailing list