diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 14:25:03 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 14:25:03 +0200 |
| commit | 3aff2e0bd313ab179e6d1e6b9686848b24dd0837 (patch) | |
| tree | 5fa3fbed98eec946b01c48b77a2714a12390a8c9 /debian/rules | |
| parent | b1c2e70c3c8c70002ca36ff453129d6b47eca08b (diff) | |
| download | java-common-3aff2e0bd313ab179e6d1e6b9686848b24dd0837.tar.gz | |
New default-java-plugin package depending on icedtea-<n>-plugin (Closes: #678381)
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index fc5ae01..60211e6 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ p_jre = openjdk-$(java_default_version)-jre p_jhl = openjdk-$(java_default_version)-jre-headless p_jdk = openjdk-$(java_default_version)-jdk p_doc = openjdk-$(java_default_version)-doc +p_plugin = icedtea-$(java_default_version)-web dversion = 2:1.$(java_default_version)-$(release) jvmdir = java-1.$(java_default_version).0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) @@ -22,6 +23,7 @@ ifeq (5, $(java_default_version)) p_jhl = gcj-jre-headless p_jdk = gcj-jdk p_doc = openjdk-8-doc + p_plugin = jvmdir = java-gcj endif @@ -48,8 +50,9 @@ 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-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_installdocs -pdefault-jdk-doc dh_installdocs -pgcj-native-helper @@ -57,7 +60,7 @@ override_dh_installdocs: override_dh_gencontrol: dh_gencontrol -i ifneq (,$(p_jre)) - dh_gencontrol -a -- \ + dh_gencontrol -a --no-package=default-java-plugin -- \ -v$(dversion) \ '-Vjre=$(p_jre)' \ '-Vjhl=$(p_jhl)' \ @@ -68,9 +71,15 @@ ifneq (,$(p_jre)) '-Vjhl:provides=$(jhl_provides)' \ '-Vjdk:provides=$(jdk_provides)' endif +ifneq (,$(p_plugin)) + dh_gencontrol -pdefault-java-plugin -- -v$(dversion) -Vplugin=$(p_plugin) -Vjre:arch=$(DEB_HOST_ARCH) +endif override_dh_builddeb: dh_builddeb -i ifneq (,$(p_jre)) - dh_builddeb -a + dh_builddeb -a --no-package=default-java-plugin +endif +ifneq (,$(p_plugin)) + dh_builddeb -pdefault-java-plugin endif |