[libcommons-cli-java] 13/31: Imported Debian patch 1.2-1

Tony Mancill tmancill at moszumanska.debian.org
Mon Jun 22 05:52:46 UTC 2015


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 4b44c4a319ff96398bac10df9b33d764e10f593b
Merge: c0cbc96 1cf38ac
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Thu Jul 2 11:30:49 2009 +0100

    Imported Debian patch 1.2-1

 NOTICE.txt                                         |   2 +-
 README.txt                                         |  31 +-
 RELEASE-NOTES.txt                                  | 104 ++--
 build.xml                                          | 166 -------
 debian/ant.properties                              |   3 -
 debian/build.properties                            |   6 +
 debian/changelog                                   |  27 +
 debian/control                                     |  13 +-
 debian/copyright                                   | 224 +--------
 debian/libcommons-cli-java.poms                    |   1 +
 debian/maven.rules                                 |   1 +
 debian/patches/MultOptions.patch                   | 122 -----
 debian/rules                                       |  25 +-
 debian/watch                                       |   2 +-
 maven.xml                                          |  47 --
 pom.xml                                            | 250 ++++++++++
 project.properties                                 |  38 --
 project.xml                                        | 202 --------
 src/assembly/bin.xml                               |  44 ++
 src/assembly/src.xml                               |  45 ++
 .../commons/cli/UtilTest.java => conf/HEADER.txt}  |  14 -
 src/conf/MANIFEST.MF                               |  25 +-
 src/conf/checkstyle.xml                            | 189 +++++++
 .../commons/cli/AlreadySelectedException.java      |  64 ++-
 src/java/org/apache/commons/cli/BasicParser.java   |  14 +-
 src/java/org/apache/commons/cli/CommandLine.java   | 121 ++++-
 .../org/apache/commons/cli/CommandLineParser.java  |  37 +-
 src/java/org/apache/commons/cli/GnuParser.java     | 143 ++----
 src/java/org/apache/commons/cli/HelpFormatter.java | 255 +++++-----
 .../commons/cli/MissingArgumentException.java      |  48 +-
 .../apache/commons/cli/MissingOptionException.java |  73 ++-
 src/java/org/apache/commons/cli/Option.java        | 171 ++++---
 src/java/org/apache/commons/cli/OptionBuilder.java |  82 ++-
 src/java/org/apache/commons/cli/OptionGroup.java   |  47 +-
 .../org/apache/commons/cli/OptionValidator.java    |  34 +-
 src/java/org/apache/commons/cli/Options.java       |  89 ++--
 .../org/apache/commons/cli/ParseException.java     |  19 +-
 src/java/org/apache/commons/cli/Parser.java        | 196 ++++----
 .../apache/commons/cli/PatternOptionBuilder.java   | 136 +++--
 src/java/org/apache/commons/cli/PosixParser.java   | 153 +++---
 src/java/org/apache/commons/cli/TypeHandler.java   | 118 ++---
 .../commons/cli/UnrecognizedOptionException.java   |  48 +-
 src/java/org/apache/commons/cli/Util.java          |  23 +-
 src/java/org/apache/commons/cli/overview.html      |  65 ++-
 src/java/org/apache/commons/cli/package.html       |  17 +-
 src/test/data/.hidden.txt                          |   1 -
 src/test/data/readable.txt                         |   1 -
 src/test/data/writable.txt                         |   1 -
 .../org/apache/commons/cli/ApplicationTest.java    | 190 +++++--
 .../apache/commons/cli/ArgumentIsOptionTest.java   |  89 ++--
 .../org/apache/commons/cli/BasicParserTest.java}   |  51 +-
 src/test/org/apache/commons/cli/BugsTest.java      | 441 ++++++-----------
 src/test/org/apache/commons/cli/BuildTest.java     | 102 ----
 .../org/apache/commons/cli/CommandLineTest.java    |  51 ++
 src/test/org/apache/commons/cli/GnuParseTest.java  | 270 ----------
 .../cli/{UtilTest.java => GnuParserTest.java}      |  17 +-
 .../apache/commons/cli/HelpFormatterExamples.java  | 113 -----
 .../org/apache/commons/cli/HelpFormatterTest.java  | 551 +++++++++++++++------
 .../apache/commons/cli/LongOptionWithShort.java    | 114 -----
 .../org/apache/commons/cli/OptionBuilderTest.java  |  88 ++--
 .../org/apache/commons/cli/OptionGroupTest.java    | 271 ++++------
 src/test/org/apache/commons/cli/OptionTest.java    | 222 ++++++---
 src/test/org/apache/commons/cli/OptionsTest.java   | 129 +++--
 .../org/apache/commons/cli/ParseRequiredTest.java  |  99 ++--
 src/test/org/apache/commons/cli/ParseTest.java     | 291 -----------
 .../org/apache/commons/cli/ParserTestCase.java     | 306 ++++++++++++
 .../commons/cli/PatternOptionBuilderTest.java      | 198 ++++++--
 .../org/apache/commons/cli/PosixParserTest.java    | 188 +++++++
 src/test/org/apache/commons/cli/UtilTest.java      |  13 +-
 src/test/org/apache/commons/cli/ValueTest.java     | 407 +++++----------
 src/test/org/apache/commons/cli/ValuesTest.java    | 127 ++---
 .../org/apache/commons/cli/bug/BugCLI133Test.java  |   8 +-
 .../org/apache/commons/cli/bug/BugCLI13Test.java   |  10 +-
 .../bug/{BugCLI51Test.java => BugCLI148Test.java}  |  45 +-
 .../org/apache/commons/cli/bug/BugCLI162Test.java  | 285 +++++++++++
 .../org/apache/commons/cli/bug/BugCLI18Test.java   |  35 +-
 .../org/apache/commons/cli/bug/BugCLI71Test.java   |  15 +-
 77 files changed, 4145 insertions(+), 4118 deletions(-)

diff --cc debian/build.properties
index 0000000,0000000..14503e4
new file mode 100644
--- /dev/null
+++ b/debian/build.properties
@@@ -1,0 -1,0 +1,6 @@@
++javadoc.dir=target/api
++build.sourceDirectory=src/java
++build.testDirectory=src/test
++build.directory=target
++maven.test.skip=true
++
diff --cc debian/changelog
index 21d8dd5,0000000..dff43e3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,125 -1,0 +1,152 @@@
++libcommons-cli-java (1.2-1) experimental; urgency=low
++
++  [ Ludovic Claude ]
++  * New upstream version (Closes: #530623)
++  * Add myself to Uploaders
++  * Change section to java, bump up Standards-Version to 3.8.1
++  * Change the dependency on java-gcj to default-jdk for Build-Depend
++  * Add Build-Depends on maven-ant-helper and use its maven-build.xml
++    file to build the package as the build system has switched to
++    Maven.
++  * Remove the dependencies on java runtimes on the binary package
++    as it's a library (avoids introducing dependencies on graphics in
++    a headless environment)
++  * Add ${misc:Depends} to Depends to clear Lintian warnings
++  * Add the Maven POM to the package,
++  * Add a Build-Depends-Indep dependency on maven-repo-helper
++  * Use mh_installpom and mh_installjar to install the POM and the jar to the
++    Maven repository
++  * Remove MultOption patch as it doesn't apply anymore and seems solved 
++    upstream.
++
++  [ Emmanuel Bourg ]
++  * Update of the URLs
++  * Rename Jakarta Commons to Apache Commons
++
++ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 02 Jul 2009 11:30:49 +0100
++
 +libcommons-cli-java (1.1-3) unstable; urgency=low
 +
 +  * Added build-depends-indep for ant-optional.
 +    (Closes: #473954)
 +
 + -- Paul Cager <paul-debian at home.paulcager.org>  Wed, 02 Apr 2008 23:38:26 +0100
 +
 +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 <paul-debian at home.paulcager.org>  Sat, 22 Mar 2008 12:40:55 +0000
 +
 +libcommons-cli-java (1.1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +    - added patches/disable-testsuite.patch to make build work
 +  * Added Vcs-Svn and Vcs-Browser fields.
 +  * Updated Standards-Version to 3.7.3.
 +
 + -- Michael Koch <konqueror at gmx.de>  Mon, 31 Dec 2007 00:15:26 +0100
 +
 +libcommons-cli-java (1.0-11) unstable; urgency=low
 +
 +  * Fixed Homepage field in debian/control. Closes: #446792.
 +
 + -- Michael Koch <konqueror at gmx.de>  Tue, 23 Oct 2007 21:03:48 +0200
 +
 +libcommons-cli-java (1.0-10) unstable; urgency=low
 +
 +  * Fixed jar name and link to jar. Closes: #446008.
 +
 + -- Michael Koch <konqueror at gmx.de>  Tue, 09 Oct 2007 22:02:45 +0200
 +
 +libcommons-cli-java (1.0-9) unstable; urgency=low
 +
 +  * Let libcommons-cli-java depend on libcommons-lang-java. Closes: #445508.
 +  * Removed dependency on libcommons-loggig-java. Not used.
 +  * Use java-gcj-compat instead of kaffe.
 +  * Removed debian/dirs, debian/install and debian/links and do this in
 +    debian/rules.
 +  * Removed debian/README.Debian as it didn't apply anymore.
 +  * Moved debhelper and cdbs to Build-Depends.
 +  * Updated debhelper level to 5.
 +  * Updated watch file to match new upstream naming scheme.
 +  * Removed Wolfgang and added myself to Uploaders.
 +  * Updated Standards-Version to 3.7.2.
 +
 + -- Michael Koch <konqueror at gmx.de>  Sat, 06 Oct 2007 17:15:10 +0200
 +
 +libcommons-cli-java (1.0-8) unstable; urgency=low
 +
 +  * Removed explicit usage of jikes build compiler property
 +    for kaffe jikes -> ecj transition
 +  * Removed jikes from build-dependencies
 +  * Removed Takashi, Ola, Stefan from Uploaders - never uploaded this package
 +  * Standards-Version 3.6.2 (no changes)
 +  * Added myself to uploaders  
 +
 + -- Wolfgang Baer <WBaer at gmx.de>  Fri,  6 Jan 2006 19:25:50 +0100
 +
 +libcommons-cli-java (1.0-7) unstable; urgency=low
 +
 +  * libant1.6-java to ant transition
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Sat, 20 Aug 2005 19:44:58 +0200
 +
 +libcommons-cli-java (1.0-6) unstable; urgency=low
 +
 +  * corrected the epoch version of kaffe dependency (closes: #302011)
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Sun,  3 Apr 2005 12:50:38 +0200
 +
 +libcommons-cli-java (1.0-5) unstable; urgency=low
 +
 +  * debian/control: typo. Thanks to Stuart Brady (closes: #286586)
 +  * added a watch file.
 +  * changed dependency from libant1.5-java to libant1.6-java
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Mon,  7 Feb 2005 12:13:43 +0100
 +
 +libcommons-cli-java (1.0-4) unstable; urgency=low
 +
 +  * Move to main: libcommons-logging-java is now in main, every
 +    dependencies are in main, the package is ready to move to main
 +  * removed dpatch dependency and using the cdbs simple patch sys
 +    facility, also, dependency with kaffe updated to 1.1.4 so the patch is
 +    no more needed
 +  * added gij and sablevm as alternative JVM
 +  * package now build with kaffe (1.1.4), libant1.5-java and jikes
 +  * debian/patches: no more patch neeeded
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Tue,  4 May 2004 17:11:58 +0200
 +
 +libcommons-cli-java (1.0-3) unstable; urgency=low
 +
 +  * debian/control (Section): goes to contrib because of
 +    libcommons-logging-java (will investigate why this package is in
 +    contrib), and because of libcommons-lang-java. This package is in
 +    contrib because it fails building with kaffe 1.1.1 because of the
 +    java.util.TimeZone.SHORT property that does not exist in this
 +    version!
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Fri,  7 Nov 2003 11:21:41 +0100
 +
 +libcommons-cli-java (1.0-2) unstable; urgency=low
 +
 +  * debian/changelog:
 +    - added uploader field.
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Wed, 29 Oct 2003 11:00:45 +0100
 +
 +libcommons-cli-java (1.0-1) unstable; urgency=low
 +
 +  * Initial Release (closes: #217804).
 +
 + -- Arnaud Vandyck <avdyk at debian.org>  Mon, 27 Oct 2003 15:19:33 +0100
 +
diff --cc debian/control
index d91ba1c,0000000..66c8eb3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,19 @@@
 +Source: libcommons-cli-java
- Section: libs
++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>, Paul Cager <paul-debian at home.paulcager.org>
- Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
- Build-Depends-Indep: java-gcj-compat-dev, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
- Standards-Version: 3.7.3
++Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>,
++ Ludovic Claude <ludovic.claude at laposte.net>
++Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk
++Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
++Standards-Version: 3.8.1
 +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://commons.apache.org/cli/
 +
 +Package: libcommons-cli-java
 +Architecture: all
- Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-lang-java (>= 2.0)
++Depends: ${misc:Depends}, libcommons-lang-java (>= 2.0)
 +Description: API for working with the command line arguments and options
 + You define arguments you want to parse, parse arguments the user
 + entered and then you can retrieve them like properties
diff --cc debian/copyright
index 57a0898,0000000..bc9beb4
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,216 -1,0 +1,22 @@@
 +This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
 +Mon, 27 Oct 2003 15:07:08 +0200.
 +
- It was downloaded from http://jakarta.apache.org/commons/cli
++It was downloaded from http://commons.apache.org/cli
 +
- Upstream Author: Bob McWirther, Peter Donald, John Keyes
++Upstream Authors: James Strachan <jstrachan at apache.org>,
++                  Bob McWhirter <bob at werken.com>,
++                  John Keyes <jbjk at mac.com>,
++                  Rob Oxspring <roxspring at imapmail.org>,
++                  Emmanuel Bourg <ebourg at apache.org>,
++                  Peter Donald,
++                  Brian Egge,
++                  Berin Loritsch <bloritsch at apache.org>,
++                  Peter Maddocks <peter_maddocks at hp.com>,
++                  Andrew Shirley
 +
- Copyright:
-     Copyright (c) 1999-2007 The Apache Software Foundation.
-     All rights reserved.
++Copyright: 2002-2009 The Apache Software Foundation
 +
- 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.
++License: Apache-2.0
 +
++On Debian systems the full text of the Apache License can be found
++in `/usr/share/common-licenses/Apache-2.0'.
diff --cc debian/libcommons-cli-java.poms
index 0000000,0000000..43e746b
new file mode 100644
--- /dev/null
+++ b/debian/libcommons-cli-java.poms
@@@ -1,0 -1,0 +1,1 @@@
++pom.xml --no-parent
diff --cc debian/maven.rules
index 0000000,0000000..8577380
new file mode 100644
--- /dev/null
+++ b/debian/maven.rules
@@@ -1,0 -1,0 +1,1 @@@
++junit junit jar s/3\..*/3.x/
diff --cc debian/rules
index 1dba989,0000000..abd5653
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,16 -1,0 +1,25 @@@
 +#!/usr/bin/make -f
 +
 +#export DH_VERBOSE=1
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/ant.mk
- 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 ant-junit
- DEB_ANT_BUILD_TARGET := jar
++PACKAGE              := $(DEB_SOURCE_PACKAGE)
++VERSION              := $(DEB_UPSTREAM_VERSION)
++JAVA_HOME            := /usr/lib/jvm/default-java
++DEB_JARS             := ant-nodeps junit commons-lang ant-junit
++DEB_ANT_BUILD_TARGET := package #javadoc
++DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
++DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
++
++binary-post-install/$(PACKAGE)::
++	mh_installpoms -p$(PACKAGE)
++	mh_installjar -p$(PACKAGE) -l pom.xml target/commons-cli-$(VERSION).jar
++
++clean::
++	-rm -rf debian/tmp
++
++get-orig-source:
++	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 +
- install/libcommons-cli-java::
- 	install -m 644 -D target/commons-cli.jar debian/libcommons-cli-java/usr/share/java/commons-cli-$(DEB_UPSTREAM_VERSION).jar
- 	dh_link -plibcommons-cli-java usr/share/java/commons-cli-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-cli.jar
diff --cc debian/watch
index 6838821,0000000..6f5108c
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://www.apache.org/dist/jakarta/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate
++http://www.apache.org/dist/commons/cli/source/commons-cli-(.*)-src\.tar\.gz debian uupdate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-cli-java.git



More information about the pkg-java-commits mailing list