[pkg-java] r10635 - trunk/libcommons-logging-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-26 11:19:07 +0000 (Sat, 26 Sep 2009)
New Revision: 10635

Modified:
   trunk/libcommons-logging-java/debian/ant.properties
   trunk/libcommons-logging-java/debian/changelog
   trunk/libcommons-logging-java/debian/compat
   trunk/libcommons-logging-java/debian/control
   trunk/libcommons-logging-java/debian/rules
Log:
libcommons-logging-java (1.1.1-5) unstable; urgency=low

  * Build-Depends on libservlet2.5-java instead of libservlet2.3-java.
  * Remove Suggests on libservlet2.3-java and libservlet2.4-java.
  * Build-Depends on debhelper >= 7.
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 13:02:56 +0200



Modified: trunk/libcommons-logging-java/debian/ant.properties
===================================================================
--- trunk/libcommons-logging-java/debian/ant.properties	2009-09-26 09:33:16 UTC (rev 10634)
+++ trunk/libcommons-logging-java/debian/ant.properties	2009-09-26 11:19:07 UTC (rev 10635)
@@ -3,5 +3,5 @@
 logkit.jar=/usr/share/java/logkit.jar
 avalon-framework.jar=/usr/share/java/avalon-framework.jar
 junit.jar=/usr/share/java/junit.jar
-servletapi.jar=/usr/share/java/servlet-2.3.jar
+servletapi.jar=/usr/share/java/servlet-api-2.5.jar
 test.failonerror=false

Modified: trunk/libcommons-logging-java/debian/changelog
===================================================================
--- trunk/libcommons-logging-java/debian/changelog	2009-09-26 09:33:16 UTC (rev 10634)
+++ trunk/libcommons-logging-java/debian/changelog	2009-09-26 11:19:07 UTC (rev 10635)
@@ -1,3 +1,12 @@
+libcommons-logging-java (1.1.1-5) unstable; urgency=low
+
+  * Build-Depends on libservlet2.5-java instead of libservlet2.3-java.
+  * Remove Suggests on libservlet2.3-java and libservlet2.4-java.
+  * Build-Depends on debhelper >= 7.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 13:02:56 +0200
+
 libcommons-logging-java (1.1.1-4) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/libcommons-logging-java/debian/compat
===================================================================
--- trunk/libcommons-logging-java/debian/compat	2009-09-26 09:33:16 UTC (rev 10634)
+++ trunk/libcommons-logging-java/debian/compat	2009-09-26 11:19:07 UTC (rev 10635)
@@ -1 +1 @@
-5
+7

Modified: trunk/libcommons-logging-java/debian/control
===================================================================
--- trunk/libcommons-logging-java/debian/control	2009-09-26 09:33:16 UTC (rev 10634)
+++ trunk/libcommons-logging-java/debian/control	2009-09-26 11:19:07 UTC (rev 10635)
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk
-Build-Depends-Indep: ant-optional, maven-repo-helper, 
- liblogkit-java, liblog4j1.2-java, junit, libservlet2.3-java
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional
+Build-Depends-Indep: maven-repo-helper, liblogkit-java, liblog4j1.2-java, junit, libservlet2.5-java
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-logging-java
 Homepage: http://commons.apache.org/logging
@@ -14,8 +13,7 @@
 Package: libcommons-logging-java
 Architecture: all
 Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
-Suggests: libservlet2.3-java | libservlet2.4-java | libservlet2.5-java,
- liblog4j1.2-java, liblogkit-java, libavalon-framework-java, libcommons-logging-java-doc
+Suggests: libservlet2.5-java, liblog4j1.2-java, liblogkit-java, libavalon-framework-java, libcommons-logging-java-doc
 Description: commmon wrapper interface for several logging APIs
  Provides a simple, component oriented interface together with wrappers for 
  several existing java logging systems. The user can choose at runtime which

Modified: trunk/libcommons-logging-java/debian/rules
===================================================================
--- trunk/libcommons-logging-java/debian/rules	2009-09-26 09:33:16 UTC (rev 10634)
+++ trunk/libcommons-logging-java/debian/rules	2009-09-26 11:19:07 UTC (rev 10635)
@@ -8,7 +8,7 @@
 VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME		     := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := dist
-DEB_JARS		     := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit
+DEB_JARS		     := commons-logging log4j-1.2 logkit avalon-framework servlet-api-2.5 junit ant-junit
 
 makebuilddir/lib$(PACKAGE)-java::
 	# copy MANIFEST.MF to src/main/resources/META-INF/ to include it in the jar