[libcommons-cli-java] 09/31: Imported Debian patch 1.1-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 0c33214366578c2384f6f3f46034797c3982127e
Merge: e498911 63cbb5d
Author: Michael Koch <konqueror at gmx.de>
Date:   Mon Dec 31 00:15:26 2007 +0100

    Imported Debian patch 1.1-1

 .cvsignore                                         |    7 -
 LICENSE.txt                                        |  262 +++-
 NOTICE.txt                                         |    5 +
 README.txt                                         |   11 +-
 RELEASE-NOTES.txt                                  |   51 +-
 build-gump.xml                                     |   36 -
 build.xml                                          |  236 ++--
 debian/ant.properties                              |    3 +-
 debian/changelog                                   |    9 +
 debian/control                                     |    8 +-
 debian/patches/disable-testsuite.patch             |   11 +
 debian/rules                                       |    2 +-
 gump.xml                                           |   40 -
 maven.xml                                          |   45 +-
 project.properties                                 |   42 +-
 project.xml                                        |  173 ++-
 src/conf/MANIFEST.MF                               |   10 +-
 .../commons/cli/AlreadySelectedException.java      |   84 +-
 src/java/org/apache/commons/cli/BasicParser.java   |   79 +-
 src/java/org/apache/commons/cli/CommandLine.java   |  312 ++---
 .../org/apache/commons/cli/CommandLineParser.java  |  128 +-
 src/java/org/apache/commons/cli/GnuParser.java     |  217 ++-
 src/java/org/apache/commons/cli/HelpFormatter.java | 1439 +++++++++++++-------
 .../commons/cli/MissingArgumentException.java      |   87 +-
 .../apache/commons/cli/MissingOptionException.java |   87 +-
 src/java/org/apache/commons/cli/Option.java        |  846 +++++++-----
 src/java/org/apache/commons/cli/OptionBuilder.java |  325 ++---
 src/java/org/apache/commons/cli/OptionGroup.java   |  151 +-
 .../org/apache/commons/cli/OptionValidator.java    |  101 ++
 src/java/org/apache/commons/cli/Options.java       |  293 ++--
 .../org/apache/commons/cli/ParseException.java     |   89 +-
 src/java/org/apache/commons/cli/Parser.java        |  396 ++++--
 .../apache/commons/cli/PatternOptionBuilder.java   |  239 ++--
 src/java/org/apache/commons/cli/PosixParser.java   |  253 ++--
 src/java/org/apache/commons/cli/TypeHandler.java   |  245 ++--
 .../commons/cli/UnrecognizedOptionException.java   |   89 +-
 src/java/org/apache/commons/cli/Util.java          |   70 +
 src/java/org/apache/commons/cli/package.html       |    2 +-
 src/media/logo.xcf                                 |  Bin 0 -> 20269 bytes
 src/test/data/.hidden.txt                          |    1 +
 src/test/data/readable.txt                         |    1 +
 src/test/data/writable.txt                         |    1 +
 .../org/apache/commons/cli/ApplicationTest.java    |   16 +
 .../apache/commons/cli/ArgumentIsOptionTest.java   |  100 ++
 src/test/org/apache/commons/cli/BugsTest.java      |  221 ++-
 src/test/org/apache/commons/cli/BuildTest.java     |   22 +-
 src/test/org/apache/commons/cli/GnuParseTest.java  |   24 +-
 .../apache/commons/cli/HelpFormatterExamples.java  |   21 +-
 ...stHelpFormatter.java => HelpFormatterTest.java} |   83 +-
 .../apache/commons/cli/LongOptionWithShort.java    |  114 ++
 .../org/apache/commons/cli/OptionBuilderTest.java  |   25 +-
 .../org/apache/commons/cli/OptionGroupTest.java    |   55 +-
 src/test/org/apache/commons/cli/OptionTest.java    |   82 ++
 src/test/org/apache/commons/cli/OptionsTest.java   |  121 ++
 .../org/apache/commons/cli/ParseRequiredTest.java  |   24 +-
 src/test/org/apache/commons/cli/ParseTest.java     |   25 +-
 .../commons/cli/PatternOptionBuilderTest.java      |   61 +-
 src/test/org/apache/commons/cli/UtilTest.java      |   30 +
 src/test/org/apache/commons/cli/ValueTest.java     |  191 ++-
 src/test/org/apache/commons/cli/ValuesTest.java    |   26 +-
 .../org/apache/commons/cli/bug/BugCLI133Test.java  |   34 +
 .../org/apache/commons/cli/bug/BugCLI13Test.java   |   52 +
 .../org/apache/commons/cli/bug/BugCLI18Test.java   |   43 +
 .../org/apache/commons/cli/bug/BugCLI51Test.java   |   51 +
 .../org/apache/commons/cli/bug/BugCLI71Test.java   |   77 ++
 xdocs/images/1x1.gif                               |  Bin 43 -> 0 bytes
 xdocs/index.xml                                    |   29 -
 xdocs/introduction.xml                             |   87 --
 xdocs/navigation.xml                               |   14 -
 xdocs/properties.xml                               |   97 --
 xdocs/usage.xml                                    |  350 -----
 71 files changed, 4986 insertions(+), 3575 deletions(-)

diff --cc debian/ant.properties
index 534a22c,0000000..481ca5b
mode 100644,000000..100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@@ -1,2 -1,0 +1,3 @@@
 +build.sysclasspath=only
- final.name=commons-cli-1.0
++final.name=commons-cli
++noget=true
diff --cc debian/changelog
index fa185e9,0000000..690d060
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,96 -1,0 +1,105 @@@
++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 8a83572,0000000..f8fb2f2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,0 +1,18 @@@
 +Source: libcommons-cli-java
 +Section: libs
 +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>
 +Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
- Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-lang-java, junit
- Standards-Version: 3.7.2
++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
 +
 +Package: libcommons-cli-java
 +Architecture: all
- Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-lang-java
++Depends: java-gcj-compat | java1-runtime | java2-runtime, 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/patches/disable-testsuite.patch
index 0000000,0000000..6d7edac
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable-testsuite.patch
@@@ -1,0 -1,0 +1,11 @@@
++--- 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 --cc debian/rules
index 4a2d80d,0000000..707dc90
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,16 -1,0 +1,16 @@@
 +#!/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
 +DEB_ANT_BUILD_TARGET := jar
 +
 +install/libcommons-cli-java::
- 	install -m 644 -D target/commons-cli-$(DEB_UPSTREAM_VERSION).jar debian/libcommons-cli-java/usr/share/java/commons-cli-$(DEB_UPSTREAM_VERSION).jar
++	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

-- 
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