From 915755b34924c6c8b3be046a30352ac0a4db3556 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Tue, 9 Aug 2011 14:32:09 +0000
Subject: [PATCH] By request: Tighten package dependencies so that the
-headless packages are installed by default if a JRE isn't installed yet.
Since the packages previously depended on
"default-jre|java5-runtime|java6-runtime", an already-installed headless
package would have satisfied the dependency.
---
debian/changelog | 11 +++++++++++
debian/control | 5 +++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 655d957e21..bf02d9fb02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+i2p (0.8.7-5) stable; urgency=low
+
+ * Depend on default-jre-headless | java5-runtime-headless |
+ java6-runtime-headless instead of the non-headless versions. Sure the
+ -headless packages fulfilled the dependency, but this way it should pull in
+ the headless package by default.
+ * Remove unused lock from core/java/src/net/i2p/crypto/ElGamalEngine.java to
+ fix lock-ups on arm/ppc CPUs
+
+ -- Kill Your TV <killyourtv@i2pmail.org> Mon, 01 Aug 2011 17:51:14 +0000
+
i2p (0.8.7-4) stable; urgency=low
* Change to allow jbigi to be built on non-x86
diff --git a/debian/control b/debian/control
index 84ba025138..14c082c8a2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: i2p
Architecture: all
Section: net
Priority: optional
-Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre | java5-runtime | java6-runtime,
+Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
adduser,
i2p-router (>= 0.8.6-5),
libjbigi-jni (>= ${source:Version}),
@@ -65,12 +65,13 @@ Package: i2p-router
Architecture: all
Section: net
Priority: optional
-Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre | java5-runtime | java6-runtime
+Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre-headless | java5-runtime-headless | java6-runtime-headless
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni (>= ${source:Version}), libjbigi-jni (<< ${source:Version}.1~)
Suggests: tor,
i2p-messenger,
+ i2phex,
i2p-tahoe-lafs,
imule,
i2pfox,
--
GitLab