diff options
| author | Torsten Werner <twerner@debian.org> | 2009-07-30 13:22:24 +0000 |
|---|---|---|
| committer | Torsten Werner <twerner@debian.org> | 2009-07-30 13:22:24 +0000 |
| commit | 0072bc909d31b946f26d349baf6a8e49a8f7e4b3 (patch) | |
| tree | 185f93fb376971d7e87ac35e312d66b9714c0332 /debian/rules | |
| parent | 45286ffa67c15af02b5bf24138c2334028bb1d9d (diff) | |
| download | java-common-debian/0.33.tar.gz | |
* Add myself to Uploaders.debian/0.33
* Add a local copy of debian-java-faq to avoid network (CVS) access during
build time.
* Sync with Ubuntu:
- Switch to OpenJDK as the default JDK/JRE.
* Update Standards-Version: 3.8.2:
- Add Vcs headers to debian/control.
* default-jdk-builddep: Depend on gcj-jdk instead of java-gcj-compat-dev.
* Build for hppa.
* Default to openjdk-6 on armel.
* On powerpc, default back to openjdk-6 instead of cacao-oj6. Still
more testsuite failures in the OpenJDK testsuite with cacao compared
to the zero port.
* debian/rules
- Fix jvmdir for powerpc, so that default-java symlink is correct.
(LP: #256949)
* On amd64, i386, ia64 and sparc, point default-* to openjdk-6,
on powerpc, point to cacao-oj6.
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/debian/rules b/debian/rules index f69bbae..bd17f00 100755 --- a/debian/rules +++ b/debian/rules @@ -15,31 +15,26 @@ jrel = $(subst java-common-0.,,$(notdir $(CURDIR))) DPKG_VARS := $(shell dpkg-architecture) DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) -p_jre = java-gcj-compat -p_jhl = java-gcj-compat-headless -p_jdk = java-gcj-compat-dev +p_jre = gcj-jre +p_jhl = gcj-jre-headless +p_jdk = gcj-jdk jdk_build_dep = -v_jre = $(S)(>= 1.0.77-4) +v_jre = v_jdk = $(v_jre) provides = java java2 java5 dversion = 1.5-$(jrel) jvmdir = java-gcj -ifneq (,$(filter $(DEB_HOST_ARCH), arm)) - p_jre = - p_headless = - p_jdk = -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) - p_jre = gcj-jre - p_jhl = gcj-jre-headless - p_jdk = gcj-jdk - v_jre = - v_jdk = - 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)) + p_jre = openjdk-6-jre + p_jhl = openjdk-6-jre-headless + p_jdk = openjdk-6-jdk + jdk_build_dep = gcj-jdk + v_jre = $(S)(>= 6b14) + v_jdk = $(v_jre) + provides = java java2 java5 java6 + dversion = 1.6-$(jrel) + jvmdir = java-6-openjdk endif jre_provides = $(call mk_cslist,$(provides),runtime) @@ -104,7 +99,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)' \ |