[libjogl2-java] 38/58: Imported Debian patch 2.0-rc11-1~exp4.2

[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 2e52f14d1a9bb5bec52147d6cbb45864772143a3
Author: Thomas Preud'homme <robotux at debian.org>
Date:   Wed Dec 26 10:11:00 2012 +0100

    Imported Debian patch 2.0-rc11-1~exp4.2
---
 debian/changelog                | 7 +++++++
 debian/patches/armhf-build.diff | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9f18a1b..d286336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc11-1~exp4.2) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Fix wrong copy/paste in changes made in previous upload.
+
+ -- Thomas Preud'homme <robotux at debian.org>  Wed, 26 Dec 2012 10:11:00 +0100
+
 libjogl2-java (2.0-rc11-1~exp4.1) experimental; urgency=low
 
   * Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to
diff --git a/debian/patches/armhf-build.diff b/debian/patches/armhf-build.diff
index 95191cf..d741850 100644
--- a/debian/patches/armhf-build.diff
+++ b/debian/patches/armhf-build.diff
@@ -168,7 +168,7 @@ unchanged:
 -      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.armv6.jogl.x11" />
 +    <target name="c.configure.linux.arm" if="isLinuxARM">
 +      <echo message="Linux.arm" />
-+      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.arm.nativewindow.x11" />
++      <property name="compiler.cfg.id"                     value="compiler.cfg.linux.arm.jogl.x11" />
 +      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.arm.jogl.x11" />
      </target>
      

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