[pkg-java] r3922 - trunk/tomcat5.5/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-07-31 20:12:34 +0000 (Tue, 31 Jul 2007)
New Revision: 3922

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/control
   trunk/tomcat5.5/debian/rules
Log:
* Clean up correctly on (re-)build (Closes: #434617).
* Replaced obsolete ${Source-Version} by ${source:Version}.
* Added myself to Uploaders.


Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2007-07-31 17:52:55 UTC (rev 3921)
+++ trunk/tomcat5.5/debian/changelog	2007-07-31 20:12:34 UTC (rev 3922)
@@ -1,5 +1,6 @@
 tomcat5.5 (5.5.23-1) unstable; urgency=low
 
+  [ Marcus Better ]
   * New upstream version.
   * Don't include /var/lib/tomcat5.5/conf/catalina.policy since it is
     auto-generated at startup. Thanks to Javier Serrano Polo. (Closes:
@@ -11,8 +12,13 @@
   * tomcat5.5-admin now depends on libcommons-collections3-java and
     libcommons-digester-java.
 
- -- Marcus Better <marcus at better.se>  Thu, 07 Jun 2007 21:19:14 +0200
+  [ Michael Koch ]
+  * Clean up correctly on (re-)build (Closes: #434617).
+  * Replaced obsolete ${Source-Version} by ${source:Version}.
+  * Added myself to Uploaders.
 
+ -- Michael Koch <konqueror at gmx.de>  Tue, 31 Jul 2007 22:09:41 +0200
+
 tomcat5.5 (5.5.20-5) unstable; urgency=low
 
   * Messages are now logged to the system log instead of the pipe

Modified: trunk/tomcat5.5/debian/control
===================================================================
--- trunk/tomcat5.5/debian/control	2007-07-31 17:52:55 UTC (rev 3921)
+++ trunk/tomcat5.5/debian/control	2007-07-31 20:12:34 UTC (rev 3922)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: java-gcj-compat-dev, ant, ant-optional, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip
 Standards-Version: 3.7.2
@@ -11,8 +11,8 @@
 
 Package: tomcat5.5
 Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), adduser (>= 3.34), ecj-bootstrap, jsvc (>= 1.0.2~svn20061127-6)
-Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version})
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), ecj-bootstrap, jsvc (>= 1.0.2~svn20061127-6)
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${source:Version}), tomcat5.5-admin (>= ${source:Version})
 Description: Servlet and JSP engine
  Apache Tomcat is the reference implementation for the Java Servlet
  and JavaServer Pages technologies.
@@ -38,7 +38,7 @@
 
 Package: tomcat5.5-webapps
 Architecture: all
-Depends: tomcat5.5 (>= ${Source-Version})
+Depends: tomcat5.5 (>= ${source:Version})
 Description: Java Servlet engine -- documentation and example web applications
  Apache Tomcat is the reference implementation for the Java Servlet
  and JavaServer Pages technologies.
@@ -50,7 +50,7 @@
 
 Package: tomcat5.5-admin
 Architecture: all
-Depends: tomcat5.5 (>= ${Source-Version}), libstruts1.2-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java
+Depends: tomcat5.5 (>= ${source:Version}), libstruts1.2-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java
 Description: Java Servlet engine -- admin & manager web interfaces
  Apache Tomcat is the reference implementation for the Java Servlet
  and JavaServer Pages technologies.

Modified: trunk/tomcat5.5/debian/rules
===================================================================
--- trunk/tomcat5.5/debian/rules	2007-07-31 17:52:55 UTC (rev 3921)
+++ trunk/tomcat5.5/debian/rules	2007-07-31 20:12:34 UTC (rev 3922)
@@ -38,7 +38,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-rm -r build/{build,compat,deployer,dist,tmp} LICENSE
+	rm -rf build/{build,compat,deployer,dist,tmp,embed} LICENSE
+	rm -rf servletapi/{jsr152,jsr154}/{build,dist}
 	dh_clean
 
 install: build