From aa6eefcc764b61a8bae230621d5311bdf98c7788 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Wed, 19 Dec 2012 21:25:04 +0000
Subject: [PATCH] debian: add commented entries required for PPA builds &
 update "debianhowto" target

If someone runs "ant debian" to make installable packages, they do not need to
have their own wrapper or commons-logging  jars. The PPA builds, however, do
require them. During the last release I made the mistake of overwriting my "PPA
debian/control" file with the one from MTN that did not include these
dependencies.

Also updating "debianhowto" to reflect the fact that we no longer use
Debian's/Ubuntu's Jetty pkgs since Jetty6 appears to be leaving their repos in
the near future.
---
 build.xml      | 2 +-
 debian/control | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index c8d3444da..bda4855f5 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
             <echo message="The following command will install all of the dependencies for you:" />
             <echo message=" " />
             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
-            <echo message="                   quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
+            <echo message="                   quilt libcommons-logging-java" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
             <echo message="to patch the source and build the packages." />
diff --git a/debian/control b/debian/control
index 42cb7596a..28f50fa1f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,9 @@ Build-Depends: debhelper (>= 7.0.50~),
  default-jdk,
  gettext,
  libgmp3-dev,
+## uncomment the next line for PPA builds
+## libservice-wrapper-java,
+ libcommons-logging-java,
  po-debconf
 
 Package: i2p