From d8fbc624aa2ebc3718d1ff80e9b9aaf90ffc9723 Mon Sep 17 00:00:00 2001 From: Emmanuel Bourg Date: Thu, 8 Oct 2015 10:59:39 +0200 Subject: Removed the dependency on default-jdk for gcj-native-helper --- debian/changelog | 1 + debian/control | 6 +----- debian/gcj-native-helper.lintian-overrides | 1 + debian/rules | 5 +++-- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 debian/gcj-native-helper.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 4bb8f88..4b63be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ java-common (0.54) UNRELEASED; urgency=medium * Use OpenJDK 8 on mips, mipsel and mips64el. * The Java Policy and the FAQ have been moved to the new java-policy package. * default-jdk-doc is now architecture dependent (Closes: #801257) + * gcj-native-helper no longer depends on default-jdk * 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/control b/debian/control index 87fed1a..bc30121 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,7 @@ Description: Standard Java or Java compatible Development Kit (documentation) Package: gcj-native-helper Architecture: any -Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends} +Depends: ${jdk:builddep}, ${misc:Depends} Provides: default-jdk-builddep Conflicts: default-jdk-builddep Replaces: default-jdk-builddep @@ -77,7 +77,3 @@ Description: Standard helper tools for creating gcj native packages helpers to compile jar/class files into native code and not a Java Development Kit (JDK). You do not need this package unless you are compiling jar/class files to native code. - . - Note: During the transition from default-jdk-builddep to - gcj-native-helper, this package will also depend on - default-jdk to avoid breakage. diff --git a/debian/gcj-native-helper.lintian-overrides b/debian/gcj-native-helper.lintian-overrides new file mode 100644 index 0000000..0972ea1 --- /dev/null +++ b/debian/gcj-native-helper.lintian-overrides @@ -0,0 +1 @@ +gcj-native-helper: debian-changelog-file-missing-or-wrong-name diff --git a/debian/rules b/debian/rules index 42f4ee3..0909541 100755 --- a/debian/rules +++ b/debian/rules @@ -63,11 +63,12 @@ override_dh_installdocs: dh_installdocs -i # Install the changelog and copyright once in default-jre-headless and use links for the other packages - dh_installdocs -pdefault-jdk-doc 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 -pgcj-native-helper /usr/share/doc/default-jdk /usr/share/doc/gcj-native-helper + + dh_installdocs -pdefault-jdk-doc + dh_installdocs -pgcj-native-helper override_dh_gencontrol: dh_gencontrol -i -- cgit v1.2.3