[pkg-java] r14668 - in trunk/libcommons-el-java/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Fri Sep 2 20:36:33 UTC 2011
Author: twerner
Date: 2011-09-02 20:36:33 +0000 (Fri, 02 Sep 2011)
New Revision: 14668
Added:
trunk/libcommons-el-java/debian/patches/0001-fix-license-location.patch
trunk/libcommons-el-java/debian/patches/0002-reduce-depends-of-javadoc-target.patch
trunk/libcommons-el-java/debian/patches/0003-rename-enum.patch
trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
trunk/libcommons-el-java/debian/patches/0005-increase-target-and-source-version-to-1.5.patch
Removed:
trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
trunk/libcommons-el-java/debian/patches/03rename_enum.patch
trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
trunk/libcommons-el-java/debian/patches/05build_xml_version.patch
Modified:
trunk/libcommons-el-java/debian/changelog
trunk/libcommons-el-java/debian/patches/series
Log:
Refresh patches and update OSGi metadata.
Modified: trunk/libcommons-el-java/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/changelog 2011-09-02 20:36:33 UTC (rev 14668)
@@ -2,11 +2,12 @@
* Team upload.
* Change Build-Depend-Indep: libservlet2.5-java.
+ * Refresh patches and update OSGi metadata.
* Remove Arnaud from Uploaders list.
* Remove Java runtime from Depends.
* Update Standards-Version: 3.9.1.
- -- Torsten Werner <twerner at debian.org> Fri, 02 Sep 2011 22:24:25 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 02 Sep 2011 22:33:38 +0200
libcommons-el-java (1.0-6) unstable; urgency=low
Added: trunk/libcommons-el-java/debian/patches/0001-fix-license-location.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0001-fix-license-location.patch (rev 0)
+++ trunk/libcommons-el-java/debian/patches/0001-fix-license-location.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -0,0 +1,40 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 2 Sep 2011 22:28:09 +0200
+Subject: fix license location
+
+---
+ build.xml | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 96e0763..c0a248a 100755
+--- a/build.xml
++++ b/build.xml
+@@ -230,7 +230,7 @@
+ <target name="dist" depends="compile,javadoc"
+ description="Create binary distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="../LICENSE"
++ <copy file="LICENSE.txt"
+ todir="${dist.home}"/>
+ <copy file="RELEASE-NOTES.txt"
+ todir="${dist.home}"/>
+@@ -242,7 +242,7 @@
+ description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="../LICENSE"
++ <copy file="LICENSE.txt"
+ tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${commons-el.jar}"
+ manifest="${build.home}/conf/MANIFEST.MF">
+@@ -257,7 +257,7 @@
+ <copy todir="${build.home}/classes/META-INF" filtering="on">
+ <fileset dir="${conf.home}" includes="*.MF"/>
+ </copy>
+- <copy file="../LICENSE"
++ <copy file="LICENSE.txt"
+ tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${commons-el.jar}"
+ manifest="${build.home}/classes/META-INF/MANIFEST.MF">
+--
Added: trunk/libcommons-el-java/debian/patches/0002-reduce-depends-of-javadoc-target.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0002-reduce-depends-of-javadoc-target.patch (rev 0)
+++ trunk/libcommons-el-java/debian/patches/0002-reduce-depends-of-javadoc-target.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 2 Sep 2011 22:28:09 +0200
+Subject: reduce depends of javadoc target
+
+---
+ build.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index c0a248a..325fdd8 100755
+--- a/build.xml
++++ b/build.xml
+@@ -207,7 +207,7 @@
+ description="Clean and compile all components"/>
+
+
+- <target name="javadoc" depends="compile"
++ <target name="javadoc" depends="compile-only"
+ description="Create component Javadoc documentation">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${dist.home}/docs"/>
+--
Added: trunk/libcommons-el-java/debian/patches/0003-rename-enum.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0003-rename-enum.patch (rev 0)
+++ trunk/libcommons-el-java/debian/patches/0003-rename-enum.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -0,0 +1,44 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 2 Sep 2011 22:28:09 +0200
+Subject: rename enum
+
+---
+ .../org/apache/commons/el/ImplicitObjects.java | 8 ++++----
+ .../org/apache/commons/el/parser/ELParser.java | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/java/org/apache/commons/el/ImplicitObjects.java b/src/java/org/apache/commons/el/ImplicitObjects.java
+index b58e4a4..7a33477 100644
+--- a/src/java/org/apache/commons/el/ImplicitObjects.java
++++ b/src/java/org/apache/commons/el/ImplicitObjects.java
+@@ -535,10 +535,10 @@ public class ImplicitObjects
+ if (pKey instanceof String) {
+ // Drain the header enumeration
+ List l = new ArrayList ();
+- Enumeration enum = request.getHeaders ((String) pKey);
+- if (enum != null) {
+- while (enum.hasMoreElements ()) {
+- l.add (enum.nextElement ());
++ Enumeration enum_ = request.getHeaders ((String) pKey);
++ if (enum_ != null) {
++ while (enum_.hasMoreElements ()) {
++ l.add (enum_.nextElement ());
+ }
+ }
+ String [] ret = (String []) l.toArray (new String [l.size ()]);
+diff --git a/src/java/org/apache/commons/el/parser/ELParser.java b/src/java/org/apache/commons/el/parser/ELParser.java
+index 4cc2f04..dbbd954 100644
+--- a/src/java/org/apache/commons/el/parser/ELParser.java
++++ b/src/java/org/apache/commons/el/parser/ELParser.java
+@@ -1838,8 +1838,8 @@ public class ELParser implements ELParserConstants {
+ jj_expentry[i] = jj_lasttokens[i];
+ }
+ boolean exists = false;
+- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
+- int[] oldentry = (int[])(enum.nextElement());
++ for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
++ int[] oldentry = (int[])(enum_.nextElement());
+ if (oldentry.length == jj_expentry.length) {
+ exists = true;
+ for (int i = 0; i < jj_expentry.length; i++) {
+--
Added: trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch (rev 0)
+++ trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -0,0 +1,30 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 2 Sep 2011 22:28:09 +0200
+Subject: add OSGi metadata
+
+---
+ src/conf/MANIFEST.MF | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
+index 5d0b47f..c908af5 100644
+--- a/src/conf/MANIFEST.MF
++++ b/src/conf/MANIFEST.MF
+@@ -5,3 +5,16 @@ Specification-Version: 2.0
+ Implementation-Title: org.apache.commons.el
+ Implementation-Vendor: Apache Software Foundation
+ Implementation-Version: 1.0
++Import-Package: javax.servlet;version="2.5",javax.servlet.http;version
++ ="2.5",javax.servlet.jsp;version="2.1",javax.servlet.jsp.el;version="
++ 2.1",javax.servlet.jsp.resources;version="2.1",javax.servlet.jsp.tage
++ xt;version="2.1",javax.servlet.resources;version="2.5"
++Bundle-ManifestVersion: 2
++Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
++ ns.el.parser;version="1.0.0"
++Bundle-Version: 1.0.0.v200806031608
++Bundle-SymbolicName: org.apache.commons.el
++Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter
++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
++Bundle-Localization: plugin
++Bundle-Vendor: Apache Software Foundation
+--
Added: trunk/libcommons-el-java/debian/patches/0005-increase-target-and-source-version-to-1.5.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/0005-increase-target-and-source-version-to-1.5.patch (rev 0)
+++ trunk/libcommons-el-java/debian/patches/0005-increase-target-and-source-version-to-1.5.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -0,0 +1,44 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 2 Sep 2011 22:28:09 +0200
+Subject: increase target and source version to 1.5
+
+---
+ build.xml | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 325fdd8..57d5116 100755
+--- a/build.xml
++++ b/build.xml
+@@ -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}">
+--
Deleted: trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,32 +0,0 @@
-Description: Corrects the location of the license file.
-
-diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml libcommons-el-java-1.0/build.xml
---- a/build.xml 2003-06-07 00:35:28.000000000 +0200
-+++ b/build.xml 2003-07-02 11:04:37.000000000 +0200
-@@ -230,7 +230,7 @@
- <target name="dist" depends="compile,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="../LICENSE"
-+ <copy file="LICENSE.txt"
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
-@@ -242,7 +242,7 @@
- description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="../LICENSE"
-+ <copy file="LICENSE.txt"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${commons-el.jar}"
- manifest="${build.home}/conf/MANIFEST.MF">
-@@ -257,7 +257,7 @@
- <copy todir="${build.home}/classes/META-INF" filtering="on">
- <fileset dir="${conf.home}" includes="*.MF"/>
- </copy>
-- <copy file="../LICENSE"
-+ <copy file="LICENSE.txt"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${commons-el.jar}"
- manifest="${build.home}/classes/META-INF/MANIFEST.MF">
Deleted: trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,14 +0,0 @@
-Description: Corrects the dependency target for the javadoc target.
-
-diff -urNad /home/arnaud/debian/ITP/jakarta/libcommons-el-java-1.0/build.xml libcommons-el-java-1.0/build.xml
---- a/libcommons-el-java-1.0/build.xml 2003-06-07 00:35:28.000000000 +0200
-+++ b/build.xml 2003-07-02 11:05:46.000000000 +0200
-@@ -207,7 +207,7 @@
- description="Clean and compile all components"/>
-
-
-- <target name="javadoc" depends="compile"
-+ <target name="javadoc" depends="compile-only"
- description="Create component Javadoc documentation">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
Deleted: trunk/libcommons-el-java/debian/patches/03rename_enum.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/03rename_enum.patch 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/03rename_enum.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,34 +0,0 @@
-Description: Renames variables named "enum" to avoid FTBFS with java5 or higher.
-
-diff -Nur -x '*.orig' -x '*~' libcommons-el-java-1.0/src/java/org/apache/commons/el/ImplicitObjects.java libcommons-el-java-1.0.new/src/java/org/apache/commons/el/ImplicitObjects.java
---- a/src/java/org/apache/commons/el/ImplicitObjects.java 2003-02-04 03:22:25.000000000 +0300
-+++ b/src/java/org/apache/commons/el/ImplicitObjects.java 2009-09-25 16:23:08.000000000 +0400
-@@ -535,10 +535,10 @@
- if (pKey instanceof String) {
- // Drain the header enumeration
- List l = new ArrayList ();
-- Enumeration enum = request.getHeaders ((String) pKey);
-- if (enum != null) {
-- while (enum.hasMoreElements ()) {
-- l.add (enum.nextElement ());
-+ Enumeration enum_ = request.getHeaders ((String) pKey);
-+ if (enum_ != null) {
-+ while (enum_.hasMoreElements ()) {
-+ l.add (enum_.nextElement ());
- }
- }
- String [] ret = (String []) l.toArray (new String [l.size ()]);
-diff -Nur -x '*.orig' -x '*~' libcommons-el-java-1.0/src/java/org/apache/commons/el/parser/ELParser.java libcommons-el-java-1.0.new/src/java/org/apache/commons/el/parser/ELParser.java
---- a/src/java/org/apache/commons/el/parser/ELParser.java 2003-03-31 05:17:07.000000000 +0400
-+++ b/src/java/org/apache/commons/el/parser/ELParser.java 2009-09-25 16:23:38.000000000 +0400
-@@ -1838,8 +1838,8 @@
- jj_expentry[i] = jj_lasttokens[i];
- }
- boolean exists = false;
-- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-- int[] oldentry = (int[])(enum.nextElement());
-+ for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
-+ int[] oldentry = (int[])(enum_.nextElement());
- if (oldentry.length == jj_expentry.length) {
- exists = true;
- for (int i = 0; i < jj_expentry.length; i++) {
Deleted: trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,21 +0,0 @@
-Description: Adds OSGi metadata to the manifest.
-
---- a/src/conf/MANIFEST.MF 2007-07-11 12:47:24.000000000 -0400
-+++ b/src/conf/MANIFEST.MF 2007-07-11 12:49:32.000000000 -0400
-@@ -9,3 +9,16 @@
- Implementation-Title: org.apache.commons.el
- Implementation-Vendor: Apache Software Foundation
- Implementation-Version: 1.0
-+Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
-+ ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="
-+ 2.0",javax.servlet.jsp.resources;version="2.0",javax.servlet.jsp.tage
-+ xt;version="2.0",javax.servlet.resources;version="2.4"
-+Bundle-ManifestVersion: 2
-+Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
-+ ns.el.parser;version="1.0.0"
-+Bundle-Version: 1.0.0.v200806031608
-+Bundle-SymbolicName: org.apache.commons.el
-+Bundle-Name: Apache Commons JSP 2.0 Expression Language Interpreter
-+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
-+Bundle-Localization: plugin
-+Bundle-Vendor: Apache Software Foundation
Deleted: trunk/libcommons-el-java/debian/patches/05build_xml_version.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/05build_xml_version.patch 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/05build_xml_version.patch 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,36 +0,0 @@
-Description: Allows the source and target version to be changed via a property.
-Bug: http://bugs.debian.org/559323
-
---- 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 2011-09-02 20:27:49 UTC (rev 14667)
+++ trunk/libcommons-el-java/debian/patches/series 2011-09-02 20:36:33 UTC (rev 14668)
@@ -1,5 +1,5 @@
-01build_xml_license_location_patch.patch
-02build_xml_javadoc_depends.patch
-03rename_enum.patch
-04add_OSGi_metadata.patch
-05build_xml_version.patch
+0001-fix-license-location.patch
+0002-reduce-depends-of-javadoc-target.patch
+0003-rename-enum.patch
+0004-add-OSGi-metadata.patch
+0005-increase-target-and-source-version-to-1.5.patch
More information about the pkg-java-commits
mailing list