diff options
author | Torsten Werner <twerner@debian.org> | 2010-08-09 19:45:13 +0000 |
---|---|---|
committer | Torsten Werner <twerner@debian.org> | 2010-08-09 19:45:13 +0000 |
commit | 0f683f87e4415c31db0afdb63f4b029bab87b80f (patch) | |
tree | 26a05e203d459732ee3608e61ba38135b4abd058 | |
parent | 083611b6ce70ae7c8767bf9a2bf02bcbe7ee67e6 (diff) | |
download | java-common-0f683f87e4415c31db0afdb63f4b029bab87b80f.tar.gz |
Change default-jdk/jre(-headless) back to gcj on the mips architecture
because openjdk FTBFS there.
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | debian/rules | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index feee1db..cec95f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +java-common (0.39) unstable; urgency=low + + * Change default-jdk/jre(-headless) back to gcj on the mips architecture + because openjdk FTBFS there. + + -- Torsten Werner <twerner@debian.org> Mon, 09 Aug 2010 21:43:52 +0200 + java-common (0.38) unstable; urgency=low * Updated the description of gcj-native-helper and also the diff --git a/debian/rules b/debian/rules index 8314b6d..cbe5bb1 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ provides = java java2 java5 dversion = 1.5-$(jrel) jvmdir = java-gcj -ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel powerpc s390 sparc sh4)) +ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mipsel powerpc s390 sparc sh4)) p_jre = openjdk-6-jre p_jhl = openjdk-6-jre-headless p_jdk = openjdk-6-jdk |