This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository libcommons-cli-java.
commit 7c3badd49dd8069a461f92fd46bdbd9f30e8a0d4 Author: Paul Cager <[email protected]> Date: Sat Mar 22 12:40:55 2008 +0000 Imported Debian patch 1.1-2 --- debian/ant.properties | 2 +- debian/changelog | 13 ++ debian/control | 4 +- debian/copyright | 258 ++++++++++++++++++++++++++------- debian/patches/MultOptions.patch | 122 ++++++++++++++++ debian/patches/disable-testsuite.patch | 11 -- debian/rules | 2 +- 7 files changed, 346 insertions(+), 66 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 481ca5b..363477f 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,3 +1,3 @@ -build.sysclasspath=only +#build.sysclasspath=only final.name=commons-cli noget=true diff --git a/debian/changelog b/debian/changelog index 690d060..c508062 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libcommons-cli-java (1.1-2) unstable; urgency=low + + * Corrected copyright - contained wrong license (Closes: #468947) + * Handles mulitple options (e.g. -D) (Closes: #469082) + - patch MultOptions.patch + * Run Junit tests during build. + - removed sysclasspath=only in ant.properties. + - added ant's JUnit jar to classpath. + * New format commons homepage URL. + * Added myself to Uploaders. + + -- Paul Cager <[email protected]> Sat, 22 Mar 2008 12:40:55 +0000 + libcommons-cli-java (1.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index f8fb2f2..0f847fd 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: libcommons-cli-java Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> +Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Paul Cager <[email protected]> Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8) Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-lang-java (>= 2.0), junit Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-cli-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-cli-java -Homepage: http://jakarta.apache.org/commons/cli +Homepage: http://commons.apache.org/cli/ Package: libcommons-cli-java Architecture: all diff --git a/debian/copyright b/debian/copyright index dc86393..57a0898 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,55 +6,211 @@ It was downloaded from http://jakarta.apache.org/commons/cli Upstream Author: Bob McWirther, Peter Donald, John Keyes Copyright: -The Apache Software License, Version 1.1 - -Copyright (c) 1999-2001 The Apache Software Foundation. All rights -reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -3. The end-user documentation included with the redistribution, if - any, must include the following acknowlegement: - "This product includes software developed by the - Apache Software Foundation (http://www.apache.org/)." - Alternately, this acknowlegement may appear in the software itself, - if and wherever such third-party acknowlegements normally appear. - -4. The names "The Jakarta Project", "Commons", and "Apache Software - Foundation" must not be used to endorse or promote products derived - from this software without prior written permission. For written - permission, please contact [email protected]. - -5. Products derived from this software may not be called "Apache" - nor may "Apache" appear in their names without prior written - permission of the Apache Group. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. -==================================================================== - -This software consists of voluntary contributions made by many -individuals on behalf of the Apache Software Foundation. For more -information on the Apache Software Foundation, please see -<http://www.apache.org/>. + Copyright (c) 1999-2007 The Apache Software Foundation. + All rights reserved. + +License: + The Apache License, Version 2.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/debian/patches/MultOptions.patch b/debian/patches/MultOptions.patch new file mode 100644 index 0000000..b758bc6 --- /dev/null +++ b/debian/patches/MultOptions.patch @@ -0,0 +1,122 @@ +Index: src/test/org/apache/commons/cli/ApplicationTest.java +=================================================================== +--- src/test/org/apache/commons/cli/ApplicationTest.java (revision 635884) ++++ src/test/org/apache/commons/cli/ApplicationTest.java (working copy) +@@ -96,15 +96,16 @@ + options.addOption( "listener", true, "add an instance of a class as a project listener" ); + options.addOption( "buildfile", true, "use given buildfile" ); + options.addOption( OptionBuilder.withDescription( "use value for given property" ) +- .hasArgs() ++ .hasArgs(1) + .withValueSeparator() + .create( 'D' ) ); + //, null, true, , false, true ); + options.addOption( "find", true, "search for buildfile towards the root of the filesystem and use it" ); + + String[] args = new String[]{ "-buildfile", "mybuild.xml", ++ "-projecthelp", + "-Dproperty=value", "-Dproperty1=value1", +- "-projecthelp" }; ++ "compile" }; + + try { + CommandLine line = parser.parse( options, args ); +@@ -121,6 +122,7 @@ + + // check option + assertTrue( line.hasOption( "projecthelp") ); ++ assertEquals(1, line.getArgs().length); + } + catch( ParseException exp ) { + fail( "Unexpected exception:" + exp.getMessage() ); +@@ -128,4 +130,4 @@ + + } + +-} +\ No newline at end of file ++} +Index: src/java/org/apache/commons/cli/Option.java +=================================================================== +--- src/java/org/apache/commons/cli/Option.java (revision 635884) ++++ src/java/org/apache/commons/cli/Option.java (working copy) +@@ -437,13 +437,15 @@ + // while there are more value separators + while (index != -1) + { +- // next value to be added +- if (values.size() == (numberOfArgs - 1)) +- { +- break; +- } ++ // Next few lines commented out in the patch. You ++ // can have multiple values in one argument, so it does not ++ // make sense to terminate the loop early (you would lose ++ // the excess arguments anyway). ++// if (values.size() == (numberOfArgs - 1)) ++// { ++// break; ++// } + +- + // store + add(value.substring(0, index)); + +@@ -463,9 +465,7 @@ + } + + /** +- * Add the value to this Option. If the number of arguments +- * is greater than zero and there is enough space in the list then +- * add the value. Otherwise, throw a runtime exception. ++ * Add the value to this Option. + * + * @param value The value to be added to this Option + * +@@ -473,10 +473,14 @@ + */ + private void add(String value) + { +- if ((numberOfArgs > 0) && (values.size() > (numberOfArgs - 1))) +- { +- throw new RuntimeException("Cannot add value, list full."); +- } ++ // The patch removes the following code as we check for ++ // numberOfArgs in the caller (where we can tell the difference ++ // between (e.g) multiple instances of an option versus one ++ // instance of the option with multiple arguments). ++// if ((numberOfArgs > 0) && (values.size() > (numberOfArgs - 1))) ++// { ++// throw new RuntimeException("Cannot add value, list full."); ++// } + + + // store value +Index: src/java/org/apache/commons/cli/Parser.java +=================================================================== +--- src/java/org/apache/commons/cli/Parser.java (revision 635884) ++++ src/java/org/apache/commons/cli/Parser.java (working copy) +@@ -325,7 +325,9 @@ + public void processArgs(Option opt, ListIterator iter) + throws ParseException + { +- // loop until an option is found ++ // loop until another option is found, or we have read the maximum ++ // number of args. ++ int argCount = 0; + while (iter.hasNext()) + { + String str = (String) iter.next(); +@@ -347,6 +349,12 @@ + iter.previous(); + break; + } ++ ++ argCount++; ++ if (argCount >= opt.getArgs() && opt.getArgs() >= 0) ++ { ++ break; ++ } + } + + if ((opt.getValues() == null) && !opt.hasOptionalArg()) diff --git a/debian/patches/disable-testsuite.patch b/debian/patches/disable-testsuite.patch deleted file mode 100644 index 6d7edac..0000000 --- a/debian/patches/disable-testsuite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml -+++ build.xml -@@ -60,7 +60,7 @@ - </fileset> - </copy> - </target> -- <target name="jar" description="o Create the jar" depends="compile,test"> -+ <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> - </jar> - </target> diff --git a/debian/rules b/debian/rules index 707dc90..1dba989 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME := /usr/lib/jvm/java-gcj ANT_HOME := /usr/share/ant -DEB_JARS := junit commons-lang +DEB_JARS := junit commons-lang ant-junit DEB_ANT_BUILD_TARGET := jar install/libcommons-cli-java:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-cli-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
