The following commit has been merged in the master-3.8 branch:
commit 65ac444abf88ff329b3c7d366fee15960b8b6ce8
Author: Jakub Adam <jakub.a...@ktknet.cz>
Date: Wed May 23 17:09:58 2012 +0200
d/control: update dependencies
diff --git a/debian/control b/debian/control
index 5d2c830..083419c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,14 @@ Build-Depends: ant (>= 1.8.2),
default-jdk,
docbook2x,
junit (>= 3.8.2-4),
- junit4 (>= 4.7-3),
+ junit4 (>= 4.10-2),
libasm3-java (>= 3.3),
libcommons-codec-java (>= 1.4-2),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
+ libfelix-gogo-command-java,
+ libfelix-gogo-shell-java,
+ libgconf2-dev,
libgtk2.0-dev,
libhamcrest-java (>= 1.1-8~),
libicu4j-4.4-java (>= 4.4.2.2),
@@ -28,6 +31,7 @@ Build-Depends: ant (>= 1.8.2),
liblucene2-java (<< 2.9.5),
libservlet3.0-java,
libswt-gtk-3-java (>= 3.8.0~m6),
+ libtomcat7-java,
lsb-release,
maven-ant-helper,
maven-repo-helper,
@@ -64,7 +68,7 @@ Architecture: all
Depends: default-jre | java5-runtime | java6-runtime,
eclipse-platform (>= ${source:Version}),
junit (>= 3.8.2-4),
- junit4 (>= 4.7-3),
+ junit4 (>= 4.10-2),
libhamcrest-java (>= 1.1-8~),
${misc:Depends}
Recommends: default-jdk | sun-java6-jdk
@@ -108,15 +112,14 @@ Depends: ant (>= 1.8.2),
eclipse-rcp (= ${binary:Version}),
java-common (>= 0.23),
libcommons-codec-java (>= 1.4-2),
- libcommons-el-java (>= 1.0-5),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
libjasper-java (>= 5.5.26),
- libjetty-java (>= 6.1.24-4~),
+ libjetty8-java,
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.4+ds1-3~),
liblucene2-java (<< 2.9.5),
- libservlet2.5-java (>= 6.0.20-8),
+ libservlet3.0-java,
sat4j (>= 2.3.0),
sat4j (<< 2.4.0),
${misc:Depends},
@@ -151,7 +154,8 @@ Description: Eclipse platform without development plug-ins
Package: eclipse-platform-data
Architecture: all
-Depends: ${misc:Depends}
+Depends: libtomcat7-java,
+ ${misc:Depends}
Replaces: eclipse (<< 3.5.2),
eclipse-platform (<< 3.5.2-4),
eclipse-platform-gcj,
@@ -179,8 +183,10 @@ Package: eclipse-rcp
Architecture: any
Depends: default-jre | java5-runtime | java6-runtime,
libequinox-osgi-java (= ${source:Version}),
+ libfelix-gogo-command-java,
+ libfelix-gogo-shell-java,
libicu4j-4.4-java (>= 4.4.2.2),
- libswt-gtk-3-java (>= 3.7.1-2),
+ libswt-gtk-3-java (>= 3.8.0~),
libswt-cairo-gtk-3-jni,
libswt-webkit-gtk-3-jni,
${misc:Depends},
@@ -210,7 +216,7 @@ Package: libequinox-osgi-java
Architecture: all
Section: java
Depends: ${misc:Depends}
-Recommends: libservlet2.5-java
+Recommends: libservlet3.0-java
Breaks: eclipse-rcp (<< 3.5.1-0ubuntu3)
Replaces: eclipse-platform-gcj, eclipse-rcp-gcj
Description: Equinox OSGi framework
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
