diff options
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index a77b2a3..8fc3b8e 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,7 @@ include debian/java_defaults.mk p_jre = openjdk-$(java_default_version)-jre p_jhl = openjdk-$(java_default_version)-jre-headless p_jdk = openjdk-$(java_default_version)-jdk +p_jdkhl = openjdk-$(java_default_version)-jdk-headless p_doc = openjdk-$(java_default_version)-doc p_plugin = icedtea-$(java_default_version)-plugin dversion = 2:1.$(java_default_version)-$(release) @@ -21,6 +22,7 @@ ifeq (5, $(java_default_version)) p_jre = gcj-jre p_jhl = gcj-jre-headless p_jdk = gcj-jdk + p_jdkhl = gcj-jdk # no gcj-jdk-headless package p_doc = openjdk-8-doc p_plugin = jvmdir = java-gcj @@ -34,6 +36,7 @@ endif jre_provides = java-runtime, java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version)) jhl_provides = java-runtime-headless, java2-runtime-headless, $(shell seq --format java%.f-runtime-headless --separator ', ' 5 $(java_default_version)) jdk_provides = java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version)) +jdkhl_provides = java-sdk-headless, java2-sdk-headless, $(shell seq --format java%.f-sdk-headless --separator ', ' 5 $(java_default_version)) %: @@ -54,9 +57,10 @@ override_dh_installdocs: # Install the changelog and copyright once in default-jre-headless and use links for the other packages dh_installdocs -pdefault-jre-headless - dh_link -pdefault-jre /usr/share/doc/default-jre-headless /usr/share/doc/default-jre - dh_link -pdefault-jdk /usr/share/doc/default-jre /usr/share/doc/default-jdk - dh_link -pdefault-java-plugin /usr/share/doc/default-jre /usr/share/doc/default-java-plugin + dh_link -pdefault-jre /usr/share/doc/default-jre-headless /usr/share/doc/default-jre + dh_link -pdefault-jdk-headless /usr/share/doc/default-jre-headless /usr/share/doc/default-jdk-headless + dh_link -pdefault-jdk /usr/share/doc/default-jre /usr/share/doc/default-jdk + dh_link -pdefault-java-plugin /usr/share/doc/default-jre /usr/share/doc/default-java-plugin dh_installdocs -pdefault-jdk-doc dh_installdocs -pgcj-native-helper @@ -69,10 +73,12 @@ ifneq (,$(p_jre)) '-Vjre=$(p_jre)' \ '-Vjhl=$(p_jhl)' \ '-Vjdk=$(p_jdk)' \ + '-Vjdkhl=$(p_jdkhl)' \ '-Vdoc=$(p_doc)' \ '-Vjre:arch=$(DEB_HOST_ARCH)' \ '-Vjre:provides=$(jre_provides)' \ '-Vjhl:provides=$(jhl_provides)' \ + '-Vjdkhl:provides=$(jdkhl_provides)' \ '-Vjdk:provides=$(jdk_provides)' endif ifneq (,$(p_plugin)) |