[pkg-java] r11577 - in trunk/libcommons-el-java/debian: . patches

[Niels Thykier]

Author: nthykier-guest
Date: 2010-02-12 18:50:00 +0000 (Fri, 12 Feb 2010)
New Revision: 11577

Added:
   trunk/libcommons-el-java/debian/patches/05build_xml_version.patch
Modified:
   trunk/libcommons-el-java/debian/changelog
   trunk/libcommons-el-java/debian/control
   trunk/libcommons-el-java/debian/patches/series
Log:
Set target version - fixes #559323

Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog	2010-02-11 23:56:17 UTC (rev 11576)
+++ trunk/libcommons-el-java/debian/changelog	2010-02-12 18:50:00 UTC (rev 11577)
@@ -1,3 +1,10 @@
+libcommons-el-java (1.0-6) UNRELEASED; urgency=low
+
+  * Set target version to 1.5. (Closes: #559323)
+  * Bumped Standards-Version to 3.8.4 - no changes required.
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 12 Feb 2010 19:47:47 +0100
+
 libcommons-el-java (1.0-5) unstable; urgency=low
 
   [ Emmanuel Bourg ]

Modified: trunk/libcommons-el-java/debian/control
===================================================================
--- trunk/libcommons-el-java/debian/control	2010-02-11 23:56:17 UTC (rev 11576)
+++ trunk/libcommons-el-java/debian/control	2010-02-12 18:50:00 UTC (rev 11577)
@@ -6,7 +6,7 @@
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>=7), cdbs, default-jdk, ant
 Build-Depends-Indep: junit (>= 3.8.1), libservlet2.4-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://commons.apache.org/el/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-el-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-el-java

Added: trunk/libcommons-el-java/debian/patches/05build_xml_version.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/05build_xml_version.patch	                        (rev 0)
+++ trunk/libcommons-el-java/debian/patches/05build_xml_version.patch	2010-02-12 18:50:00 UTC (rev 11577)
@@ -0,0 +1,33 @@
+--- a/build.xml	2010-02-12 19:41:31.842284948 +0100
++++ b/build.xml	2010-02-12 19:44:16.010284117 +0100
+@@ -84,6 +84,12 @@
+   <!-- Should Java compilations set the 'optimize' compiler option? -->
+   <property name="compile.optimize"        value="true"/>
+ 
++  <!-- The java source version -->
++  <property name="compile.source"          value="1.5"/>
++
++  <!-- The java target version -->
++  <property name="compile.target"          value="1.5"/>
++
+   <!-- Construct compile classpath -->
+   <path id="compile.classpath">
+     <pathelement location="${build.home}/classes"/>
+@@ -170,6 +176,8 @@
+   <target name="compile-only" >
+     <javac  srcdir="${source.home}"
+            destdir="${build.home}/classes"
++            source="${compile.source}"
++            target="${compile.target}"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}">
+@@ -185,6 +193,8 @@
+    description="Compile unit test cases">
+     <javac  srcdir="${test.home}"
+            destdir="${build.home}/tests"
++            source="${compile.source}"
++            target="${compile.target}"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}">

Modified: trunk/libcommons-el-java/debian/patches/series
===================================================================
--- trunk/libcommons-el-java/debian/patches/series	2010-02-11 23:56:17 UTC (rev 11576)
+++ trunk/libcommons-el-java/debian/patches/series	2010-02-12 18:50:00 UTC (rev 11577)
@@ -2,3 +2,4 @@
 02build_xml_javadoc_depends.patch
 03rename_enum.patch
 04add_OSGi_metadata.patch
+05build_xml_version.patch