summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2016-02-05 00:42:16 +0100
committerEmmanuel Bourg <ebourg@apache.org>2016-02-05 00:42:16 +0100
commitd9a3d82d815c971c8c87686fa8e5704f2dec2c89 (patch)
treeee774183fd771a460940b119f7d09086e3176fe8
parente0900ab8113a540ced58ac38fab221b2254b2180 (diff)
downloadjava-common-d9a3d82d815c971c8c87686fa8e5704f2dec2c89.tar.gz
Properly handle the symlink to dir conversion in gcj-native-helper (Closes: #813223)
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rw-r--r--debian/gcj-native-helper.maintscript1
3 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e0497dc..9c8426a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ java-common (0.55) UNRELEASED; urgency=medium
* Fixed the name of the plugin dependency
(icedtea-<n>-plugin instead of icedtea-<n>-web)
* Standards-Version updated to 3.9.7 (no changes)
+ * Properly handle the symlink to dir conversion in gcj-native-helper
+ (Closes: #813223)
[ Matthias Klose ]
* Bump m68k, sh4 and sparc64 to 1.8.
diff --git a/debian/control b/debian/control
index 214495f..b32f156 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,7 @@ Description: Default Java Plugin for running applets and Java Web Start applicat
Package: gcj-native-helper
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: gcj-jdk, ${misc:Depends}
Provides: default-jdk-builddep
Conflicts: default-jdk-builddep
diff --git a/debian/gcj-native-helper.maintscript b/debian/gcj-native-helper.maintscript
new file mode 100644
index 0000000..0301f31
--- /dev/null
+++ b/debian/gcj-native-helper.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/gcj-native-helper /usr/share/doc/default-jdk 0.55~