Bug#313555: java-package: make-jpkg does not detect sun j2sdk because of wrong DEB_BUILD_GNU_TYPE

[Stefan Potyra]

Package: java-package
Version: 0.24
Severity: normal
Tags: patch

Hi,

make-jpkg doesn't detect jdk-1_5_0_03-linux-i586.bin (sun's j2sdk), because
dpkg-architecture says:

Arkelon:~# dpkg-architecture
DEB_BUILD_ARCH=i386
DEB_BUILD_ARCH_OS=linux
DEB_BUILD_ARCH_CPU=i386
DEB_BUILD_GNU_CPU=i486
DEB_BUILD_GNU_SYSTEM=linux-gnu
DEB_BUILD_GNU_TYPE=i486-linux-gnu
DEB_HOST_ARCH=i386
DEB_HOST_ARCH_OS=linux
DEB_HOST_ARCH_CPU=i386
DEB_HOST_GNU_CPU=i486
DEB_HOST_GNU_SYSTEM=linux-gnu
DEB_HOST_GNU_TYPE=i486-linux-gnu

Here a patch that works for me (maybe other shell scripts should be modified as
well).

Arkelon:/tmp/j# diff -Naur java-package-0.24/old/sun-j2sdk.sh
java-package-0.24/lib/sun-j2sdk.sh
--- java-package-0.24/old/sun-j2sdk.sh  2005-06-14 12:59:17.000000000 +0200
+++ java-package-0.24/lib/sun-j2sdk.sh  2005-06-14 12:59:47.000000000 +0200
@@ -3,7 +3,7 @@
   local found=
      eval $(dpkg-architecture)
         case "$DEB_BUILD_GNU_TYPE" in
	 -    "i386-linux")
	 +    "i386-linux" | "i486-linux-gnu")
	        case "$archive_name" in
		        "j2sdk-1_4_1_"[0-9][0-9]"-linux-i586.bin") # SUPPORTED
			            j2se_version="1.4.1+${archive_name:12:2}"
				    


Cheers,
	Stefan.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11nh4
Locale: LANG=de_DE@euro, LC_CTYPE=de_DE@euro (charmap=ISO-8859-15)

Versions of packages java-package depends on:
ii  coreutils                     5.2.1-2    The GNU core utilities
ii  debhelper                     4.2.36     helper programs for debian/rules
ii  fakeroot                      1.3        Gives a fake root environment

-- no debconf information