[libjogl2-java] 35/58: Imported Debian patch 2.0-rc11-1~exp3

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit 32bce2b83f35cbeb3d9d2643dc41faf443cb4c40
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Thu Dec 20 17:04:08 2012 +0100

    Imported Debian patch 2.0-rc11-1~exp3
---
 debian/ant.properties           |  6 ++++++
 debian/changelog                |  9 ++++++++
 debian/patches/armhf-build.diff | 46 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  2 ++
 4 files changed, 63 insertions(+)

diff --git a/debian/ant.properties b/debian/ant.properties
index d73613e..a1108ad 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -52,3 +52,9 @@ antlr.jar=/usr/share/java/antlrall.jar
 
 
 user.properties.file=true 
+# Ensure that source and target are 1.6
+# For backwards compat on Java 7
+target.sourcelevel=1.6
+target.targetlevel=1.6
+target.rt.jar=/usr/lib/jvm/default-java/jre/lib/rt.jar
+
diff --git a/debian/changelog b/debian/changelog
index 6984542..5f09aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjogl2-java (2.0-rc11-1~exp3) experimental; urgency=low
+
+  * Apply Ubuntu changes introduced in 2.0-rc8-1ubuntu1
+  * Set source and target to 1.5 for OpenJDK 6 compatibility (LP: #1049719).
+  * Try something with Thomas Preud'homme to see if we can fix the armhf
+    build
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 20 Dec 2012 17:04:08 +0100
+
 libjogl2-java (2.0-rc11-1~exp2) experimental; urgency=low
 
   * Enable the verbose mode to find out the reason of the FTBFS under armhf
diff --git a/debian/patches/armhf-build.diff b/debian/patches/armhf-build.diff
new file mode 100644
index 0000000..cda8e61
--- /dev/null
+++ b/debian/patches/armhf-build.diff
@@ -0,0 +1,46 @@
+Index: libjogl2-java-2.0-rc11/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc11.orig/make/build-nativewindow.xml	2012-11-26 11:52:13.000000000 +0100
++++ libjogl2-java-2.0-rc11/make/build-nativewindow.xml	2012-12-20 16:11:30.000000000 +0100
+@@ -342,7 +342,7 @@
+         <includepath path="/usr/local/include" />
+       </compiler>
+ 
+-      <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
++      <compiler id="compiler.cfg.linux.armv7hf.nativewindow.x11" extends="compiler.cfg.linux.armv7hf">
+         <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+         <compilerarg value="-idirafter" />
+         <compilerarg value="/usr/include" />
+@@ -396,7 +396,7 @@
+         <syslibset libs="Xrender"/>
+       </linker>
+ 
+-      <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
++      <linker id="linker.cfg.linux.armv7hf.nativewindow.x11" extends="linker.cfg.linux.armv7hf">
+         <syslibset libs="X11" />
+         <syslibset libs="Xxf86vm" />
+         <syslibset libs="Xrender" />
+@@ -487,10 +487,10 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
+     </target>
+     
+-    <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+-      <echo message="Linux.armv6" />
+-      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6.nativewindow.x11" />
+-      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv6.nativewindow.x11" />
++    <target name="c.configure.linux.armv7hf" if="isLinuxArmv7hf">
++      <echo message="Linux.armv7hf" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7hf.nativewindow.x11" />
++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv7hf.nativewindow.x11" />
+     </target>
+     
+     <target name="c.configure.linux.ia64" if="isLinuxIA64">
+@@ -541,7 +541,7 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++    <target name="c.configure.linux" depends="c.configure.linux.armv7hf,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+ 
+     <target name="c.configure.android" if="isAndroid">
+       <echo message="Android" />
diff --git a/debian/patches/series b/debian/patches/series
index 13f767a..9b76c27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@ TARGET_PLATFORM_LIBS_2.diff
 manifest.diff
 armhfbuild.diff
 s390x.diff
+armhf-build.diff
+

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