diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 14:46:30 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2015-10-08 14:46:30 +0200 |
| commit | d367baadd4acaffd9074fd9dd296c78bf0e1c130 (patch) | |
| tree | 81b84a646e4d79f3e6d0d234a27115773ee98345 | |
| parent | 887ee4ef9273205d8ab3234a0e59c21845abb68f (diff) | |
| download | java-common-d367baadd4acaffd9074fd9dd296c78bf0e1c130.tar.gz | |
Dropped support for non multiarch aware openjdk packages
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6b52b49..8cbe5b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ java-common (0.54) UNRELEASED; urgency=medium * gcj-native-helper no longer depends on default-jdk * gcj-native-helper depends on gcj-jdk instead of openjdk (regression in 0.53) * default-jdk/jre now have unversioned dependencies on openjdk + * Dropped support for non multiarch aware openjdk packages * update-java-alternatives now supports bash completion (Closes: #777550) * The output of update-java-alternatives --list is now aligned vertically * Removed the unused classpath-from-jars-1 example diff --git a/debian/rules b/debian/rules index 60211e6..3a8920a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,6 @@ release = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//") DEB_HOST_ARCH ?= $(shell dpkg-architecture --query DEB_HOST_ARCH) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture --query DEB_HOST_MULTIARCH) include debian/java_defaults.mk @@ -16,7 +15,7 @@ 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)) +jvmdir = java-1.$(java_default_version).0-openjdk-$(DEB_HOST_ARCH) ifeq (5, $(java_default_version)) p_jre = gcj-jre |