diff options
| author | Matthias Klose <doko@debian.org> | 2008-07-30 13:54:04 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@debian.org> | 2008-07-30 13:54:04 +0000 |
| commit | 21f8303db09e254fbc8f4cfaf82c0dff682b98c2 (patch) | |
| tree | d62f1ea32007f10c0180b8ba8d0d61003762e46c | |
| parent | ac51c75b880ab73ec226e47f31849f214a9bd0ce (diff) | |
| download | java-common-21f8303db09e254fbc8f4cfaf82c0dff682b98c2.tar.gz | |
* On alpha, point default-* to openjdk-6.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 33 |
2 files changed, 37 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 316ab0a..eaa992c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +java-common (0.31) UNRELEASED; urgency=low + + * On alpha, point default-* to openjdk-6. + + -- Matthias Klose <doko@debian.org> Wed, 30 Jul 2008 14:41:31 +0200 + java-common (0.30) unstable; urgency=low * Fix description generation for default-jre. Closes: #476978. diff --git a/debian/rules b/debian/rules index e9c3757..742dac7 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,36 @@ provides = java java2 java5 dversion = 1.5-$(jrel) jvmdir = java-gcj -ifneq (,$(filter $(DEB_HOST_ARCH), alpha arm hppa)) +#ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 ia64 lpia sparc)) +ifneq (,$(filter $(DEB_HOST_ARCH), alpha)) + p_jre = openjdk-6-jre + p_jhl = openjdk-6-jre-headless + p_jdk = openjdk-6-jdk + jdk_build_dep = java-gcj-compat-dev + v_jre = $(S)(>= 6b11) + v_jdk = $(v_jre) + provides = java java2 java5 java6 + dversion = 1.6-$(jrel) + jvmdir = java-6-openjdk +endif + +ifeq (0,1) +ifneq (,$(filter $(DEB_HOST_ARCH), alpha powerpc)) + p_jre = cacao-oj6-jre + p_hl = cacao-oj6-jre-headless + p_jdk = cacao-oj6-jdk + ifeq (,$(filter $(DEB_HOST_ARCH), alpha)) + jdk_build_dep = java-gcj-compat-dev + endif + v_jre = + v_jdk = + provides = java java2 java5 java6 + dversion = 1.6-$(jrel) + jvmdir = cacao-6-openjdk +endif +endif + +ifneq (,$(filter $(DEB_HOST_ARCH), arm hppa)) p_jre = p_headless = p_jdk = @@ -93,7 +122,7 @@ ifneq (,$(p_jre)) '-Vjre=$(p_jre)' \ '-Vjhl=$(p_jhl)' \ '-Vjdk=$(p_jdk)' \ - '-Vjdk:builddep=$(jdk_builddep)' \ + '-Vjdk:builddep=$(jdk_build_dep)' \ '-Vjre:arch=$(DEB_HOST_ARCH)' \ '-Vjre:version=$(v_jre)' \ '-Vjdk:version=$(v_jdk)' \ |