[pkg-java] r12543 - trunk/groovy/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-06-09 09:10:27 +0000 (Wed, 09 Jun 2010)
New Revision: 12543

Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/rules
Log:
* debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
  instead of libservlet2.4-java
* debian/control: Remove useless runtime dependency on libclassworlds-java

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2010-06-08 15:40:58 UTC (rev 12542)
+++ trunk/groovy/debian/changelog	2010-06-09 09:10:27 UTC (rev 12543)
@@ -1,12 +1,18 @@
 groovy (1.7.2-1) unstable; urgency=low
 
+  [ Torsten Werner ]
   UNRELEASED, FTBFS: needs jansi
   * New upstream release
   * Change maintainers into Maintainers.
   * Update patches and convert them to dep3 format.
 
- -- Torsten Werner <twerner at debian.org>  Sun, 11 Apr 2010 22:15:39 +0200
+  [ Thierry Carrez ]
+  * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
+    instead of libservlet2.4-java
+  * debian/control: Remove useless runtime dependency on libclassworlds-java
 
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 09 Jun 2010 10:53:24 +0200
+
 groovy (1.7.0-3) unstable; urgency=low
 
   * Replace asm2 with asm3 in debian/maven.rules. (Closes: #571356)

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2010-06-08 15:40:58 UTC (rev 12542)
+++ trunk/groovy/debian/control	2010-06-09 09:10:27 UTC (rev 12543)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java,
  libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java
  (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
- 1.2), libservlet2.4-java, libxstream-java, libjline-java, antlr,
+ 1.2), libservlet2.5-java, libxstream-java, libjline-java, antlr,
  tofrodos, ivy, libqdox-java, libjarjar-java
 Standards-Version: 3.8.4
 Homepage: http://groovy.codehaus.org/
@@ -17,9 +17,9 @@
 Package: groovy
 Architecture: all
 Depends: ${misc:Depends}, antlr, libasm3-java, libbsf-java,
- libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0),
+ libcommons-cli-java (>= 1.0),
  libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>=
- 0.09), libregexp-java (>= 1.2), libservlet2.4-java, libjline-java,
+ 0.09), libregexp-java (>= 1.2), libservlet2.5-java, libjline-java,
  libxstream-java, ivy, default-jre-headless | java5-runtime-headless
 Suggests: groovy-doc, ant (>= 1.7.1)
 Description: Agile dynamic language for the Java Virtual Machine

Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules	2010-06-08 15:40:58 UTC (rev 12542)
+++ trunk/groovy/debian/rules	2010-06-09 09:10:27 UTC (rev 12543)
@@ -9,7 +9,7 @@
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_BUILD_TARGET := install doc
 DEB_ANT_ARGS	     := -debug -DskipTests=true -DskipFetch=true
-DEB_JARS             := ant mockobjects-core servlet-api jsp-api commons-cli antlr	\
+DEB_JARS             := ant mockobjects-core servlet-api-2.5 jsp-api-2.1 commons-cli antlr	\
             ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm3 \
             asm3-util asm3-tree asm3-analysis ivy bnd qdox jarjar
 API_DOCS             := target/html/api