From 28e3ab913261701d9b5f20cb1591622b690460b3 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Sun, 4 Mar 2012 18:40:01 +0000
Subject: [PATCH] Minor tweaks so that debs can be built again

Work is needed so that I2P is built using jetty packages from
Debian/Ubuntu.
---
 debian/control          | 1 +
 debian/i2p-router.links | 3 +++
 debian/patches/series   | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7941f4617..3b68354d7 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,7 @@ Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  default-jre-headless | java5-runtime-headless | java6-runtime-headless,
+ glassfish-javaee,
  libcommons-logging-java,
  libjetty-java,
  libtomcat6-java
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index a4f0cf368..c33f4e3f4 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -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/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
+
+# from glassfish-javaee
+/usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/glassfish-javaee.jar
diff --git a/debian/patches/series b/debian/patches/series
index 8d42ccd70..8feb9ec9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 0002-jbigi-soname.patch
 0003-renaming-jcpuid.patch
 0004-oom-listener.patch
-#debian-version.patch
-0004-jetty6.patch
+#0004-jetty6.patch