[pkg-java] r3512 - in branches/tomcat5.5/feature/debian: connectors/util debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2007-05-18 14:08:18 +0000 (Fri, 18 May 2007)
New Revision: 3512

Modified:
   branches/tomcat5.5/feature/debian/connectors/util/build.xml
   branches/tomcat5.5/feature/debian/debian/ant.properties
   branches/tomcat5.5/feature/debian/debian/changelog
Log:
Set javac source level to 1.5, needed and supported in new GCJ. Fixes
#424465.
  --Denna och nedanst?\195?\165ende rader kommer inte med i
loggmeddelandet--

M    debian/changelog
M    debian/ant.properties
M    connectors/util/build.xml


Modified: branches/tomcat5.5/feature/debian/connectors/util/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/build.xml	2007-05-18 13:48:53 UTC (rev 3511)
+++ branches/tomcat5.5/feature/debian/connectors/util/build.xml	2007-05-18 14:08:18 UTC (rev 3512)
@@ -69,6 +69,7 @@
         <javac srcdir="java"
 	       destdir="${tomcat-util.build}/classes"
 	       deprecation="${compile.deprecation}"
+               source="${compile.source}"
 	       debug="${compile.debug}"
 	       optimize="off"
 	       verbose="off"

Modified: branches/tomcat5.5/feature/debian/debian/ant.properties
===================================================================
--- branches/tomcat5.5/feature/debian/debian/ant.properties	2007-05-18 13:48:53 UTC (rev 3511)
+++ branches/tomcat5.5/feature/debian/debian/ant.properties	2007-05-18 14:08:18 UTC (rev 3512)
@@ -1,3 +1,4 @@
+compile.source=1.5
 activation.jar=/usr/share/java/activation.jar
 commons-daemon.jar=/usr/share/java/commons-daemon.jar
 commons-fileupload.jar=/usr/share/java/commons-fileupload.jar

Modified: branches/tomcat5.5/feature/debian/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog	2007-05-18 13:48:53 UTC (rev 3511)
+++ branches/tomcat5.5/feature/debian/debian/changelog	2007-05-18 14:08:18 UTC (rev 3512)
@@ -12,6 +12,8 @@
   * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
     "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
     <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
+  * Build with source level 1.5, since GCJ now supports generics. (Closes:
+    #424465)
   * Recognise Sun JDK 6 from the sun-java6-jdk package.
   * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
     Baer from Uploaders.