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

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-03-17 13:01:59 +0000 (Thu, 17 Mar 2011)
New Revision: 13438

Modified:
   trunk/libgluegen2-java/debian/changelog
   trunk/libgluegen2-java/debian/patches/other-archs.diff
Log:
* Fix build issues with arm

Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog	2011-03-16 23:54:59 UTC (rev 13437)
+++ trunk/libgluegen2-java/debian/changelog	2011-03-17 13:01:59 UTC (rev 13438)
@@ -1,6 +1,12 @@
+gluegen2 (2.0-rc2-5) UNRELEASED; urgency=low
+
+  * Fix build issues with arm
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 17 Mar 2011 14:00:40 +0100
+
 gluegen2 (2.0-rc2-4) experimental; urgency=low
 
-  * Same playern try again: I forgot some declarations in make/build.xml
+  * Same player, try again: I forgot some declarations in make/build.xml
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 16 Mar 2011 21:23:33 +0100
 

Modified: trunk/libgluegen2-java/debian/patches/other-archs.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/other-archs.diff	2011-03-16 23:54:59 UTC (rev 13437)
+++ trunk/libgluegen2-java/debian/patches/other-archs.diff	2011-03-17 13:01:59 UTC (rev 13438)
@@ -23,11 +23,11 @@
 +    <condition property="isLinuxArmel">
 +      <and>
 +        <istrue value="${isLinux}" />
-+        <os arch="armel" />
++        <os arch="arm" />
 +      </and>
 +    </condition>
-+    <condition property="armel">
-+      <os arch="armel" />
++    <condition property="arm">
++      <os arch="arm" />
 +    </condition>
 +    <condition property="isLinuxHPPA">
 +      <and>
@@ -184,7 +184,7 @@
 +      <echo message="Linux.armel" />
 +      <property name="compiler.cfg.id.base"          value="compiler.cfg.linux" /> 
 +      <property name="linker.cfg.id.base"            value="linker.cfg.linux" /> 
-+      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/armel/" />
++      <property name="java.lib.dir.platform"         value="${java.home.dir}/jre/lib/arm/" />
 +    </target>
 +
 +    <target name="gluegen.cpptasks.declare.compiler.linux.hppa" if="isLinuxHPPA">