[pkg-java] r13425 - in trunk/libgluegen2-java/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-03-14 19:38:46 +0000 (Mon, 14 Mar 2011)
New Revision: 13425

Added:
   trunk/libgluegen2-java/debian/patches/alpha-ia64.diff
   trunk/libgluegen2-java/debian/patches/macosx.diff
Modified:
   trunk/libgluegen2-java/debian/changelog
   trunk/libgluegen2-java/debian/patches/series
Log:
gluegen2 (2.0-rc2-2) experimental; urgency=low

  * Beginning of the management of other debian archs. Partially fixes the
    bug #615872.


Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog	2011-03-14 19:29:39 UTC (rev 13424)
+++ trunk/libgluegen2-java/debian/changelog	2011-03-14 19:38:46 UTC (rev 13425)
@@ -1,3 +1,10 @@
+gluegen2 (2.0-rc2-2) experimental; urgency=low
+
+  * Beginning of the management of other debian archs. Partially fixes the
+    bug #615872.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 13 Mar 2011 22:54:39 +0100
+
 gluegen2 (2.0-rc2-1) experimental; urgency=low
 
   * New upstream release

Added: trunk/libgluegen2-java/debian/patches/alpha-ia64.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/alpha-ia64.diff	                        (rev 0)
+++ trunk/libgluegen2-java/debian/patches/alpha-ia64.diff	2011-03-14 19:38:46 UTC (rev 13425)
@@ -0,0 +1,87 @@
+diff -ur plop/gluegen-v2.0-rc2/make//build.xml gluegen2-2.0-rc2/make//build.xml
+--- plop/gluegen-v2.0-rc2/make//build.xml	2011-03-04 14:24:34.000000000 +0100
++++ gluegen2-2.0-rc2/make//build.xml	2011-03-13 22:46:10.000000000 +0100
+@@ -272,7 +272,13 @@
+       <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+     </target>
+ 
+-    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" >
++    <target name="declare.linux.alpha" if="isLinuxAlpha">
++      <echo message="Linux.alpha" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" /> 
++      <property name="linker.cfg.id"                        value="linker.cfg.linux.amd64" /> 
++    </target>
++
++    <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha" if="isLinux" >
+       <property name="c.src.dir.os"                         value="unix" />
+       <property name="java.includes.dir.platform"           value="${java.includes.dir}/linux" />
+     </target>
+--- plop/gluegen-v2.0-rc2/make//gluegen-cpptasks-base.xml	2011-03-04 14:24:34.000000000 +0100
++++ gluegen2-2.0-rc2/make//gluegen-cpptasks-base.xml	2011-03-13 22:45:46.000000000 +0100
+@@ -24,6 +24,7 @@
+    -   isLinuxAMD64
+    -   isLinuxIA64
+    -   isLinuxX86
++   -   isLinuxAlpha
+    -   isOSX
+    -   isOSXPPC
+    -   isSolaris
+@@ -236,6 +243,15 @@
+     <condition property="isIA64">
+       <os arch="IA64" />
+     </condition>
++    <condition property="isLinuxAlpha">
++      <and>
++        <istrue value="${isLinux}" />
++        <os arch="alpha" />
++      </and>
++    </condition>
++    <condition property="alpha">
++      <os arch="alpha" />
++    </condition>
+     <condition property="isSolaris32Bit">
+       <and>
+          <istrue value="${isSolaris}" />
+@@ -305,6 +321,7 @@
+     <echo message="LinuxAMD64=${isLinuxAMD64}" />
+     <echo message="LinuxIA64=${isLinuxIA64}" />
+     <echo message="LinuxX86=${isLinuxX86}" />
++    <echo message="LinuxAlpha=${isLinuxAlpha}" />
+     <echo message="OS X=${isOSX}" />
+     <echo message="OS X PPC=${use.macosppc}" />
+     <echo message="OS X x32=${use.macosx32}" />
+@@ -346,7 +363,11 @@
+     <property name="os.and.arch" value="linux-i586" />
+   </target>
+ 
+-  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os.2" />
++  <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
++    <property name="os.and.arch" value="linux-alpha" />
++  </target>
++
++  <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" />
+ 
+   <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
+     <property name="native.library.suffix"     value="*lib" />
+@@ -881,12 +902,19 @@
+ 
+     <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
+       <echo message="Linux.IA64" />
+-      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
++      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.amd64" /> 
+       <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
+       <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/ia64" />
+     </target>
+ 
+-    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinux">
++    <target name="gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinuxAlpha">
++      <echo message="Linux.Alpha" />
++      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux.amd64" /> 
++      <property name="linker.cfg.id.base"            value="linker.cfg.linux.amd64" /> 
++      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/alpha" />
++    </target>
++
++    <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinux">
+         <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+     </target>
+ 

Added: trunk/libgluegen2-java/debian/patches/macosx.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/macosx.diff	                        (rev 0)
+++ trunk/libgluegen2-java/debian/patches/macosx.diff	2011-03-14 19:38:46 UTC (rev 13425)
@@ -0,0 +1,21 @@
+Index: gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml
+===================================================================
+--- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml	2011-03-13 22:21:01.000000000 +0100
++++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml	2011-03-13 22:21:53.000000000 +0100
+@@ -138,10 +138,16 @@
+       <istrue value="${macosppc}" />
+     </condition>
+     <condition property="use.macosx32">
++     <and>
+       <istrue value="${macosx32}" />
++      <os family="mac"/>
++     </and>
+     </condition>
+     <condition property="use.macosx64">
++     <and>
+       <istrue value="${macosx64}" />
++      <os family="mac"/>
++     </and>
+     </condition>
+   </target>
+ 

Modified: trunk/libgluegen2-java/debian/patches/series
===================================================================
--- trunk/libgluegen2-java/debian/patches/series	2011-03-14 19:29:39 UTC (rev 13424)
+++ trunk/libgluegen2-java/debian/patches/series	2011-03-14 19:38:46 UTC (rev 13425)
@@ -2,3 +2,5 @@
 renamedLibrary.diff
 disablesSomeOptions.diff
 disableArchive7z.diff
+macosx.diff
+alpha-ia64.diff