Minor tweaks so that debs can be built again

Work is needed so that I2P is built using jetty packages from
Debian/Ubuntu.
This commit is contained in:
kytv
2012-03-04 18:40:01 +00:00
parent 60f35bdd5d
commit 28e3ab9132
3 changed files with 5 additions and 2 deletions

1
debian/control vendored
View File

@@ -70,6 +70,7 @@ Section: net
Priority: optional Priority: optional
Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
default-jre-headless | java5-runtime-headless | java6-runtime-headless, default-jre-headless | java5-runtime-headless | java6-runtime-headless,
glassfish-javaee,
libcommons-logging-java, libcommons-logging-java,
libjetty-java, libjetty-java,
libtomcat6-java libtomcat6-java

View File

@@ -20,3 +20,6 @@ usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar
# from glassfish-javaee
/usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/glassfish-javaee.jar

View File

@@ -2,5 +2,4 @@
0002-jbigi-soname.patch 0002-jbigi-soname.patch
0003-renaming-jcpuid.patch 0003-renaming-jcpuid.patch
0004-oom-listener.patch 0004-oom-listener.patch
#debian-version.patch #0004-jetty6.patch
0004-jetty6.patch