[libjogl2-java] 06/58: Imported Debian patch 2.0-rc2-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 0f474ecba7b99e3522be5540468b73e6b1c63280
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Tue Jun 21 21:54:41 2011 +0200

    Imported Debian patch 2.0-rc2-3
---
 debian/changelog                    |  9 ++++++
 debian/control                      |  2 +-
 debian/patches/otherArchsoswin.diff | 55 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  2 ++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b594768..86e5e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjogl2-java (2.0-rc2-3) unstable; urgency=low
+
+  * Support of the other debian arch. Should fix the various FTBFS
+    (otherArchsoswin.diff)
+  * Update dependency libswt-gtk-3.5-java to libswt-gtk-3.6-java
+    (Closes: #629777)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 21 Jun 2011 21:54:41 +0200
+
 libjogl2-java (2.0-rc2-2) unstable; urgency=low
 
   * cg-common.cfg.diff, build-java.diff, build.diff & defaultDebianPath.diff
diff --git a/debian/control b/debian/control
index 763aee0..ca5f2ac 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
  ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, 
  x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java, ant-contrib,
  ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, libgluegen2-rt-java,
- junit4, libswt-gtk-3.5-java
+ junit4, libswt-gtk-3.6-java
 Standards-Version: 3.9.2
 Homepage: http://jogamp.org/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
diff --git a/debian/patches/otherArchsoswin.diff b/debian/patches/otherArchsoswin.diff
new file mode 100644
index 0000000..0174153
--- /dev/null
+++ b/debian/patches/otherArchsoswin.diff
@@ -0,0 +1,55 @@
+Index: libjogl2-java-2.0-rc2/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc2.orig/make/build-nativewindow.xml	2011-06-21 21:45:17.000000000 +0200
++++ libjogl2-java-2.0-rc2/make/build-nativewindow.xml	2011-06-21 21:50:08.000000000 +0200
+@@ -437,7 +437,49 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.x11" if="isLinux" />
++    <target name="c.configure.linux.armel" if="isLinuxArmel">
++      <echo message="Linux.Armel" />
++      <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.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">
++      <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">
++      <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">
++      <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">
++      <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">
++      <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" />
++    </target>
++
++    <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.armel,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+ 
+     <target name="c.configure.solaris32" depends="c.configure.x11" if="isSolaris32Bit">
+       <echo message="Solaris" />
diff --git a/debian/patches/series b/debian/patches/series
index ab459a8..b687149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 variousFixes.diff
 disableOneDir.diff
 swt.diff
+otherArchsoswin.diff
+

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