[pkg-java] r14669 - in tags/libcommons-el-java: . 1.0-7/debian 1.0-7/debian/patches
Torsten Werner
twerner at alioth.debian.org
Fri Sep 2 20:38:02 UTC 2011
Author: twerner
Date: 2011-09-02 20:38:01 +0000 (Fri, 02 Sep 2011)
New Revision: 14669
Added:
tags/libcommons-el-java/1.0-7/
tags/libcommons-el-java/1.0-7/debian/changelog
tags/libcommons-el-java/1.0-7/debian/control
tags/libcommons-el-java/1.0-7/debian/patches/0001-fix-license-location.patch
tags/libcommons-el-java/1.0-7/debian/patches/0002-reduce-depends-of-javadoc-target.patch
tags/libcommons-el-java/1.0-7/debian/patches/0003-rename-enum.patch
tags/libcommons-el-java/1.0-7/debian/patches/0004-add-OSGi-metadata.patch
tags/libcommons-el-java/1.0-7/debian/patches/0005-increase-target-and-source-version-to-1.5.patch
tags/libcommons-el-java/1.0-7/debian/patches/series
tags/libcommons-el-java/1.0-7/debian/rules
Removed:
tags/libcommons-el-java/1.0-7/debian/changelog
tags/libcommons-el-java/1.0-7/debian/control
tags/libcommons-el-java/1.0-7/debian/patches/01build_xml_license_location_patch.patch
tags/libcommons-el-java/1.0-7/debian/patches/02build_xml_javadoc_depends.patch
tags/libcommons-el-java/1.0-7/debian/patches/03rename_enum.patch
tags/libcommons-el-java/1.0-7/debian/patches/04add_OSGi_metadata.patch
tags/libcommons-el-java/1.0-7/debian/patches/05build_xml_version.patch
tags/libcommons-el-java/1.0-7/debian/patches/series
tags/libcommons-el-java/1.0-7/debian/rules
Log:
[svn-buildpackage] Tagging libcommons-el-java 1.0-7
Deleted: tags/libcommons-el-java/1.0-7/debian/changelog
===================================================================
--- trunk/libcommons-el-java/debian/changelog 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/changelog 2011-09-02 20:38:01 UTC (rev 14669)
@@ -1,69 +0,0 @@
-libcommons-el-java (1.0-6) unstable; 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 20:00:14 +0100
-
-libcommons-el-java (1.0-5) unstable; urgency=low
-
- [ Emmanuel Bourg ]
- * Update of the URLs
- * Rename Jakarta Commons to Apache Commons
-
- [ Niels Thykier ]
- * Added myself to uploaders.
- * Updated Build-Depends(-Indep).
- - Replace java-gcj-compat with default-jdk
- - Move default-jdk and ant to Build-Depends.
- * Made debian/rules respect errors.
- * Bumped debhelper compat to 7.
- * Bumped Standards-Version to 3.8.3:
- - Changed section to java.
- - Added Vcs-* fields.
- * Added more alternatives to java and changed to the -headless
- version of them.
- * Added missing ${misc:Depends}.
- * Imported patch from Ubuntu to fix FTBFS.
- - Thanks to Ilya Barygin for the patch.
- * Updated existing patches to be "quilt" appliable.
- * Imported patch from Fedora to add OSGi metadata. (Closes: #558180)
- * Converted source format to 3.0 (quilt).
- * Added descriptions to the patches.
- * Added doc-base for the javadoc.
-
- -- Niels Thykier <niels at thykier.net> Thu, 26 Nov 2009 23:53:34 +0100
-
-libcommons-el-java (1.0-4) unstable; urgency=low
-
- * Use java-gcj-compat intead of kaffe. Closes: #399372.
- * Moved debhelper and cdbs to Build-Depends.
- * Use Homepage: field in debian/control instead of homepage url in long
- description.
- * Updated debhelper level to 5.
- * Removed Wolfgang and added myself to Uploaders.
- * Updated Standards-Version to 3.7.2.
-
- -- Michael Koch <konqueror at gmx.de> Sun, 07 Oct 2007 13:09:38 +0200
-
-libcommons-el-java (1.0-3) unstable; urgency=low
-
- * kaffe compiler transition
- * Standards-Version 3.6.2 (no changes)
- * Bumped debhelper version to fix linda error
- * Added myself to uploaders
-
- -- Wolfgang Baer <WBaer at gmx.de> Sun, 15 Jan 2006 17:22:06 +0100
-
-libcommons-el-java (1.0-2) unstable; urgency=low
-
- * libant1.6-java to ant transition
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 19:48:07 +0200
-
-libcommons-el-java (1.0-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> Tue, 1 Jul 2003 17:04:27 +0200
-
Copied: tags/libcommons-el-java/1.0-7/debian/changelog (from rev 14668, trunk/libcommons-el-java/debian/changelog)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/changelog (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/changelog 2011-09-02 20:38:01 UTC (rev 14669)
@@ -0,0 +1,80 @@
+libcommons-el-java (1.0-7) unstable; urgency=low
+
+ * 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:33:38 +0200
+
+libcommons-el-java (1.0-6) unstable; 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 20:00:14 +0100
+
+libcommons-el-java (1.0-5) unstable; urgency=low
+
+ [ Emmanuel Bourg ]
+ * Update of the URLs
+ * Rename Jakarta Commons to Apache Commons
+
+ [ Niels Thykier ]
+ * Added myself to uploaders.
+ * Updated Build-Depends(-Indep).
+ - Replace java-gcj-compat with default-jdk
+ - Move default-jdk and ant to Build-Depends.
+ * Made debian/rules respect errors.
+ * Bumped debhelper compat to 7.
+ * Bumped Standards-Version to 3.8.3:
+ - Changed section to java.
+ - Added Vcs-* fields.
+ * Added more alternatives to java and changed to the -headless
+ version of them.
+ * Added missing ${misc:Depends}.
+ * Imported patch from Ubuntu to fix FTBFS.
+ - Thanks to Ilya Barygin for the patch.
+ * Updated existing patches to be "quilt" appliable.
+ * Imported patch from Fedora to add OSGi metadata. (Closes: #558180)
+ * Converted source format to 3.0 (quilt).
+ * Added descriptions to the patches.
+ * Added doc-base for the javadoc.
+
+ -- Niels Thykier <niels at thykier.net> Thu, 26 Nov 2009 23:53:34 +0100
+
+libcommons-el-java (1.0-4) unstable; urgency=low
+
+ * Use java-gcj-compat intead of kaffe. Closes: #399372.
+ * Moved debhelper and cdbs to Build-Depends.
+ * Use Homepage: field in debian/control instead of homepage url in long
+ description.
+ * Updated debhelper level to 5.
+ * Removed Wolfgang and added myself to Uploaders.
+ * Updated Standards-Version to 3.7.2.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 07 Oct 2007 13:09:38 +0200
+
+libcommons-el-java (1.0-3) unstable; urgency=low
+
+ * kaffe compiler transition
+ * Standards-Version 3.6.2 (no changes)
+ * Bumped debhelper version to fix linda error
+ * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Sun, 15 Jan 2006 17:22:06 +0100
+
+libcommons-el-java (1.0-2) unstable; urgency=low
+
+ * libant1.6-java to ant transition
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 19:48:07 +0200
+
+libcommons-el-java (1.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Arnaud Vandyck <arnaud.vandyck at ulg.ac.be> Tue, 1 Jul 2003 17:04:27 +0200
+
Deleted: tags/libcommons-el-java/1.0-7/debian/control
===================================================================
--- trunk/libcommons-el-java/debian/control 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/control 2011-09-02 20:38:01 UTC (rev 14669)
@@ -1,24 +0,0 @@
-Source: libcommons-el-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
- 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.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
-
-Package: libcommons-el-java
-Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
- java5-runtime-headless | java6-runtime-headless,
- libservlet2.4-java,
- ${misc:Depends}
-Description: Implementation of the JSP2.0 Expression Language interpreter
- The JSP 2.0 specification provides a portable API for evaluating "EL
- Expressions": The classes and interfaces in the javax.servlet.jsp.el
- package describe and define programmatic access to the Expression
- Language evaluator. This package is an implementation of the API.
Copied: tags/libcommons-el-java/1.0-7/debian/control (from rev 14667, trunk/libcommons-el-java/debian/control)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/control (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/control 2011-09-02 20:38:01 UTC (rev 14669)
@@ -0,0 +1,20 @@
+Source: libcommons-el-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
+Build-Depends-Indep: junit (>= 3.8.1), libservlet2.5-java
+Standards-Version: 3.9.1
+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
+
+Package: libcommons-el-java
+Architecture: all
+Depends: libservlet2.5-java, ${misc:Depends}
+Description: Implementation of the JSP2.0 Expression Language interpreter
+ The JSP 2.0 specification provides a portable API for evaluating "EL
+ Expressions": The classes and interfaces in the javax.servlet.jsp.el
+ package describe and define programmatic access to the Expression
+ Language evaluator. This package is an implementation of the API.
Copied: tags/libcommons-el-java/1.0-7/debian/patches/0001-fix-license-location.patch (from rev 14668, trunk/libcommons-el-java/debian/patches/0001-fix-license-location.patch)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/0001-fix-license-location.patch (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/0001-fix-license-location.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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">
+--
Copied: tags/libcommons-el-java/1.0-7/debian/patches/0002-reduce-depends-of-javadoc-target.patch (from rev 14668, trunk/libcommons-el-java/debian/patches/0002-reduce-depends-of-javadoc-target.patch)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/0002-reduce-depends-of-javadoc-target.patch (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/0002-reduce-depends-of-javadoc-target.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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"/>
+--
Copied: tags/libcommons-el-java/1.0-7/debian/patches/0003-rename-enum.patch (from rev 14668, trunk/libcommons-el-java/debian/patches/0003-rename-enum.patch)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/0003-rename-enum.patch (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/0003-rename-enum.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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++) {
+--
Copied: tags/libcommons-el-java/1.0-7/debian/patches/0004-add-OSGi-metadata.patch (from rev 14668, trunk/libcommons-el-java/debian/patches/0004-add-OSGi-metadata.patch)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/0004-add-OSGi-metadata.patch (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/0004-add-OSGi-metadata.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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
+--
Copied: tags/libcommons-el-java/1.0-7/debian/patches/0005-increase-target-and-source-version-to-1.5.patch (from rev 14668, trunk/libcommons-el-java/debian/patches/0005-increase-target-and-source-version-to-1.5.patch)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/0005-increase-target-and-source-version-to-1.5.patch (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/0005-increase-target-and-source-version-to-1.5.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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: tags/libcommons-el-java/1.0-7/debian/patches/01build_xml_license_location_patch.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/01build_xml_license_location_patch.patch 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/01build_xml_license_location_patch.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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: tags/libcommons-el-java/1.0-7/debian/patches/02build_xml_javadoc_depends.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/02build_xml_javadoc_depends.patch 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/02build_xml_javadoc_depends.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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: tags/libcommons-el-java/1.0-7/debian/patches/03rename_enum.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/03rename_enum.patch 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/03rename_enum.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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: tags/libcommons-el-java/1.0-7/debian/patches/04add_OSGi_metadata.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/04add_OSGi_metadata.patch 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/04add_OSGi_metadata.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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: tags/libcommons-el-java/1.0-7/debian/patches/05build_xml_version.patch
===================================================================
--- trunk/libcommons-el-java/debian/patches/05build_xml_version.patch 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/05build_xml_version.patch 2011-09-02 20:38:01 UTC (rev 14669)
@@ -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}">
Deleted: tags/libcommons-el-java/1.0-7/debian/patches/series
===================================================================
--- trunk/libcommons-el-java/debian/patches/series 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/patches/series 2011-09-02 20:38:01 UTC (rev 14669)
@@ -1,5 +0,0 @@
-01build_xml_license_location_patch.patch
-02build_xml_javadoc_depends.patch
-03rename_enum.patch
-04add_OSGi_metadata.patch
-05build_xml_version.patch
Copied: tags/libcommons-el-java/1.0-7/debian/patches/series (from rev 14668, trunk/libcommons-el-java/debian/patches/series)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/patches/series (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/patches/series 2011-09-02 20:38:01 UTC (rev 14669)
@@ -0,0 +1,5 @@
+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
Deleted: tags/libcommons-el-java/1.0-7/debian/rules
===================================================================
--- trunk/libcommons-el-java/debian/rules 2011-09-02 20:18:23 UTC (rev 14666)
+++ tags/libcommons-el-java/1.0-7/debian/rules 2011-09-02 20:38:01 UTC (rev 14669)
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Arnaud Vandyck <avdyk at debian.org>
-# based on the work of Stefan Gybas:
-# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
-
-#
-# Build commons-el
-#
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := servlet-api jsp-api junit
-DEB_ANT_BUILD_TARGET := jar-only javadoc
-
-# Additional options to pass to the Java virtual machine
-#ANT_OPTS := -verify *
-
-# Additional command-line arguments for Ant
-#ANT_ARGS := -verbose
-
-LIBRARY_PACKAGE := commons-el
-API_VERSION := 1.0
-
-configure/lib$(LIBRARY_PACKAGE)-java::
- mkdir -p target/classes
- mkdir -p dist
-
-install/lib$(LIBRARY_PACKAGE)-java::
- install -m 644 dist/$(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
- ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
-
-clean::
- rm -fr target dist
-
Copied: tags/libcommons-el-java/1.0-7/debian/rules (from rev 14667, trunk/libcommons-el-java/debian/rules)
===================================================================
--- tags/libcommons-el-java/1.0-7/debian/rules (rev 0)
+++ tags/libcommons-el-java/1.0-7/debian/rules 2011-09-02 20:38:01 UTC (rev 14669)
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2005 Arnaud Vandyck <avdyk at debian.org>
+# based on the work of Stefan Gybas:
+# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
+
+#
+# Build commons-el
+#
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+DEB_JARS := servlet-api-2.5 jsp-api-2.1 junit
+DEB_ANT_BUILD_TARGET := jar-only javadoc
+
+# Additional options to pass to the Java virtual machine
+#ANT_OPTS := -verify *
+
+# Additional command-line arguments for Ant
+#ANT_ARGS := -verbose
+
+LIBRARY_PACKAGE := commons-el
+API_VERSION := 1.0
+
+configure/lib$(LIBRARY_PACKAGE)-java::
+ mkdir -p target/classes
+ mkdir -p dist
+
+install/lib$(LIBRARY_PACKAGE)-java::
+ install -m 644 dist/$(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
+ ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
+
+clean::
+ rm -fr target dist
+
More information about the pkg-java-commits
mailing list