[SCM] UNNAMED PROJECT branch, master, updated. 0.37-13-gab56655

[Niels Thykier]

The following commit has been merged in the master branch:
commit 1a2c417a560d959ff5d82f43918f111b1a97f227
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jan 23 11:28:09 2012 +0100

    java-arch.sh: Fixed the java architecture for s390x
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 5fc00b3..b3e1c43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ javatools (0.40) UNRELEASED; urgency=low
 
   * Fixed a regression jh_build (introduced in 0.38).
     (Closes: #656872)
+  * Fixed the java architecture for s390x.
 
  -- Niels Thykier <niels at thykier.net>  Tue, 17 Jan 2012 17:08:25 +0100
 
diff --git a/java-arch.sh b/java-arch.sh
index 9284e66..0dd3271 100755
--- a/java-arch.sh
+++ b/java-arch.sh
@@ -20,9 +20,6 @@ case $DPKG_ARCH in
 	powerpc|powerpcspe)
 		echo ppc
 		;;
-	s390x)
-		echo s390
-		;; 
 	hppa)
 		echo parisc
 		;; 

-- 
UNNAMED PROJECT