[pkg-java] r13811 - in trunk/libjogl2-java/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-06-21 20:12:44 +0000 (Tue, 21 Jun 2011)
New Revision: 13811

Added:
   trunk/libjogl2-java/debian/patches/otherArchsoswin.diff
Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/control
   trunk/libjogl2-java/debian/patches/series
Log:
  * 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)


Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2011-06-20 22:33:29 UTC (rev 13810)
+++ trunk/libjogl2-java/debian/changelog	2011-06-21 20:12:44 UTC (rev 13811)
@@ -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

Modified: trunk/libjogl2-java/debian/control
===================================================================
--- trunk/libjogl2-java/debian/control	2011-06-20 22:33:29 UTC (rev 13810)
+++ trunk/libjogl2-java/debian/control	2011-06-21 20:12:44 UTC (rev 13811)
@@ -7,7 +7,7 @@
  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

Added: trunk/libjogl2-java/debian/patches/otherArchsoswin.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/otherArchsoswin.diff	                        (rev 0)
+++ trunk/libjogl2-java/debian/patches/otherArchsoswin.diff	2011-06-21 20:12:44 UTC (rev 13811)
@@ -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" />

Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series	2011-06-20 22:33:29 UTC (rev 13810)
+++ trunk/libjogl2-java/debian/patches/series	2011-06-21 20:12:44 UTC (rev 13811)
@@ -1,3 +1,5 @@
 variousFixes.diff
 disableOneDir.diff
 swt.diff
+otherArchsoswin.diff
+