[gradle-1.12] 44/211: Add dependency on libtomcat6-java

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository gradle-1.12.

commit 9a37ebcb2d206fcf911222bddbdc172acb817d4d
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Tue May 24 23:37:59 2011 -0430

    Add dependency on libtomcat6-java
---
 debian/control                         | 4 ++--
 debian/gradle.links                    | 1 +
 debian/patches/01_use_debian_jars.diff | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ca69316..3db52b5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle,
  libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java (>= 0.9.28),
  junit4, libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java,
  libjsch-java, libjzlib-java, testng, libcommons-collections3-java,
- libmaven-ant-tasks-java, libjansi-java, libjna-posix-java,
+ libmaven-ant-tasks-java, libjansi-java, libjna-posix-java, libtomcat6-java,
  libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java,
  libplexus-utils-java, libwagon-java, libcodenarc-groovy-java,
  checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd,
@@ -28,7 +28,7 @@ Depends: default-jre-headless, groovy (>= 1.7.4), ant (>= 1.8),
  libgradle-plugins-java (= ${binary:Version}), libantlr-java, libasm3-java,
  libcommons-cli-java, libcommons-io-java, libdom4j-java,
  libgoogle-collections-java (>= 1.0), ivy, libjaxen-java, libjoptsimple-java,
- libslf4j-java, liblogback-java (>= 0.9.28), junit4, libxmlunit-java,
+ libslf4j-java, liblogback-java (>= 0.9.28), junit4, libtomcat6-java,
  libcommons-httpclient-java, libcommons-codec-java, libjsch-java, libjzlib-java,
  testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java,
  libjna-posix-java, libplexus-containers-java, libmaven2-core-java,
diff --git a/debian/gradle.links b/debian/gradle.links
index eefb2ed..c2c2124 100644
--- a/debian/gradle.links
+++ b/debian/gradle.links
@@ -42,6 +42,7 @@ usr/share/java/plexus-component-api.jar          usr/share/gradle/lib/core-impl/
 usr/share/java/plexus-utils.jar                  usr/share/gradle/lib/core-impl/plexus-utils.jar
 usr/share/java/wagon-provider-api.jar            usr/share/gradle/lib/core-impl/wagon-provider-api.jar
 
+usr/share/java/annotations-api.jar               usr/share/gradle/lib/plugins/annotations-api.jar
 usr/share/java/ant-antlr.jar                     usr/share/gradle/lib/plugins/ant-antlr.jar
 usr/share/java/antlr.jar                         usr/share/gradle/lib/plugins/antlr.jar
 usr/share/java/bnd.jar                           usr/share/gradle/lib/plugins/bnd.jar
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index c18e6c6..467b180 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -146,7 +146,7 @@ Last-Update: 2011-05-24
 +    runtime "org.mortbay.jetty:jsp-api:2.1 at jar",
 +            "org.mortbay.jetty:jetty-naming:6.1.24 at jar",
 +            "org.mortbay.jetty:jetty-annotations:6.1.24 at jar"
-+//            "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
++            "javax.annotations:annotations-api:6.0.32 at jar"
  
      testCompile project(path: ':core', configuration: 'testFixtures')
      testRuntime project(path: ':core', configuration: 'testFixturesRuntime')

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