[derby] 18/53: Added a dependency on the Servlet API to fix the incomplete compilation of derbynet.jar

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository derby.

commit de9a56d8bb7f5e7ece921596aadd5f3718e42dcf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 7 16:19:33 2013 +0000

    Added a dependency on the Servlet API to fix the incomplete compilation of derbynet.jar
---
 debian/ant.properties | 1 +
 debian/changelog      | 2 ++
 debian/control        | 8 +++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index 496c37b..daa3ac7 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -2,3 +2,4 @@
 sane=false
 deprecation=off
 junit=/usr/share/java/junit.jar
+servlet24=/usr/share/java/servlet-api-3.0.jar
diff --git a/debian/changelog b/debian/changelog
index f0c864b..685f9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ derby (10.10.1.1-1) UNRELEASED; urgency=low
   * Removed the Javadoc for the tests from the documentation package
   * Installed Maven poms to /usr/share/maven-repo
   * Added the missing patch descriptions
+  * Added a dependency on the Servlet API to fix the incomplete compilation
+    of derbynet.jar
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 07 Jun 2013 00:51:41 +0200
 
diff --git a/debian/control b/debian/control
index 7d3b0f0..2ffc4c2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Tim Booth <tbooth at ceh.ac.uk>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, javacc (>= 5.0-5), junit, liboro-java, ant (>= 1.7), maven-repo-helper
+Build-Depends: debhelper (>= 9), default-jdk, javacc (>= 5.0-5), junit, liboro-java, ant (>= 1.7),
+ maven-repo-helper, libservlet3.0-java
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/derby
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/derby
@@ -26,6 +27,7 @@ Description: Apache Derby Client JDBC Driver
 Package: libderby-java
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: libservlet3.0-java
 Suggests: derby-doc
 Description: Apache Derby Database Engine and Embedded JDBC Driver
  Apache Derby is an open source relational database implemented entirely
@@ -39,8 +41,8 @@ Description: Apache Derby Database Engine and Embedded JDBC Driver
     Network Client JDBC driver and Derby Network Server.
   * Derby is easy to install, deploy, and use.
  .
- This package includes the database server, the embedded JDBC driver, utilities
- and localisations.
+ This package includes the database server, the embedded JDBC driver and
+ localisations.
 
 Package: derby-tools
 Architecture: all

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git