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.
This commit is contained in:
kytv
2011-08-09 14:32:09 +00:00
parent 255ccdcbc1
commit 915755b349
2 changed files with 14 additions and 2 deletions

11
debian/changelog vendored
View File

@@ -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

5
debian/control vendored
View File

@@ -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,