Merge lp:~james-page/ubuntu/natty/libjna-java/multiarch-fix-2 into lp:ubuntu/natty/libjna-java

[James Page]

Minor update to ensure that multiarch paths for powerpc are generated correctly.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-22 08:57:17 +0000
+++ debian/changelog	2011-03-28 12:25:18 +0000
@@ -1,3 +1,9 @@
+libjna-java (3.2.4-2ubuntu2) natty; urgency=low
+
+  * Fix incorrect generation of PowerPC multi-arch paths (LP: #737603).
+
+ -- James Page <[e-mail]>  Mon, 28 Mar 2011 09:27:48 +0100
+
 libjna-java (3.2.4-2ubuntu1) natty; urgency=low
 
   * Fix native library search to be multi-arch compatible (LP: #737603):

=== modified file 'debian/patches/07-multiarch-support.patch'
--- debian/patches/07-multiarch-support.patch	2011-03-22 08:57:17 +0000
+++ debian/patches/07-multiarch-support.patch	2011-03-28 12:25:18 +0000
@@ -64,7 +64,7 @@
 +                if (Platform.isIntel()) {
 +                    cpu = (Platform.is64Bit() ? "x86_64" : "i386");
 +                } else if (Platform.isPPC()) {
-+                    cpu = (Platform.is64Bit() ? "ppc64" : "ppc");
++                    cpu = (Platform.is64Bit() ? "powerpc64" : "powerpc");
 +                } else if (Platform.isARM()) {
 +                    cpu = "arm";
 +					libc = "gnueabi";

=== modified file 'src/com/sun/jna/NativeLibrary.java'
--- src/com/sun/jna/NativeLibrary.java	2011-03-22 08:57:17 +0000
+++ src/com/sun/jna/NativeLibrary.java	2011-03-28 12:25:18 +0000
@@ -639,7 +639,7 @@
                 if (Platform.isIntel()) {
                     cpu = (Platform.is64Bit() ? "x86_64" : "i386");
                 } else if (Platform.isPPC()) {
-                    cpu = (Platform.is64Bit() ? "ppc64" : "ppc");
+                    cpu = (Platform.is64Bit() ? "powerpc64" : "powerpc");
                 } else if (Platform.isARM()) {
                     cpu = "arm";
 					libc = "gnueabi";