[libjogl2-java] 11/58: Imported Debian patch 2.0-rc3-3

[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 ba4349a04a4619ed6601d426974d58c0c7f06355
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Sun Oct 9 19:26:30 2011 +0200

    Imported Debian patch 2.0-rc3-3
---
 debian/changelog                     |  6 +++++
 debian/patches/arch_naming.diff      | 48 ++++++++++++++++++++++++++++++++++++
 debian/patches/disable_git_call.diff | 11 ++++++---
 debian/patches/series                |  2 +-
 4 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aee9bda..68eab62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libjogl2-java (2.0-rc3-3) unstable; urgency=low
+
+  * Fix more FTBFS
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 09 Oct 2011 19:26:30 +0200
+
 libjogl2-java (2.0-rc3-2) unstable; urgency=low
 
   * Fix various FTBFS:
diff --git a/debian/patches/arch_naming.diff b/debian/patches/arch_naming.diff
new file mode 100644
index 0000000..c040ae0
--- /dev/null
+++ b/debian/patches/arch_naming.diff
@@ -0,0 +1,48 @@
+Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml	2011-10-09 18:55:30.000000000 +0200
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml	2011-10-09 19:16:39.000000000 +0200
+@@ -465,37 +465,37 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.hppa" if="isLinuxHPPA">
++    <target name="c.configure.linux.hppa" if="isLinuxHppa">
+       <echo message="Linux.HPPA" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.mips" if="isLinuxMIPS">
++    <target name="c.configure.linux.mips" if="isLinuxMips">
+       <echo message="Linux.MIPS" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.mipsel" if="isLinuxMIPSEL">
++    <target name="c.configure.linux.mipsel" if="isLinuxMipsel">
+       <echo message="Linux.MIPSEL" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.ppc" if="isLinuxPPC">
++    <target name="c.configure.linux.ppc" if="isLinuxPpc">
+       <echo message="Linux.PPC" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.s390" if="isLinuxS390">
++    <target name="c.configure.linux.s390" if="isLinuxs390">
+       <echo message="Linux.S390" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux.sparc" if="isLinuxSPARC">
++    <target name="c.configure.linux.sparc" if="isLinuxSparc">
+       <echo message="Linux.SPARC" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
diff --git a/debian/patches/disable_git_call.diff b/debian/patches/disable_git_call.diff
index c81ee81..1783c12 100644
--- a/debian/patches/disable_git_call.diff
+++ b/debian/patches/disable_git_call.diff
@@ -2,7 +2,7 @@ Index: libjogl2-java-2.0-rc3/make/build-common.xml
 ===================================================================
 --- libjogl2-java-2.0-rc3.orig/make/build-common.xml	2011-10-08 11:34:17.000000000 +0200
 +++ libjogl2-java-2.0-rc3/make/build-common.xml	2011-10-08 11:47:45.000000000 +0200
-@@ -70,14 +70,6 @@
+@@ -70,19 +70,7 @@
          <property name="jogl.build.number" value="manual"/>
          <property name="jogl.build.id"     value="${version.timestamp}"/>
          <mkdir dir="${tempdir}" />
@@ -15,5 +15,10 @@ Index: libjogl2-java-2.0-rc3/make/build-common.xml
 -            <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
 -        </exec>
          <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
-         <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
-                   outputproperty="jogl.build.commit">
+-        <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+-                  outputproperty="jogl.build.commit">
+-            <arg line="rev-parse HEAD"/>
+-        </exec>
+         <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
+ 
+         <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
diff --git a/debian/patches/series b/debian/patches/series
index fcd6408..650c4fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,6 @@ variousFixes.diff
 swt.diff
 otherArchsoswin.diff
 disable_android.diff
-
 disable_git_call.diff
 disable_android_2.diff
+arch_naming.diff

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