CVS jakarta-log4j1.2/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Mon Nov 7 18:35:08 UTC 2005
Update of /cvsroot/pkg-java/jakarta-log4j1.2/debian
In directory haydn:/tmp/cvs-serv21936/debian
Modified Files:
README.Debian changelog control copyright
liblog4j1.2-java.links rules
Added Files:
liblog4j1.2-java-doc.doc-base
Log Message:
jakarta-log4j1.2 (1.2.12-1) unstable; urgency=low
* New upstream release (closes: #328253)
* Use kaffe for building instead of jikes alone
Fixes the FTBS (closes: #334634)
* Remove useless parts from README.Debian
* Standards-Version 3.6.2 (no changes)
* Don't depend on java-common
* Remove outdated log4j 1.1 section from description
* Register manual with doc-base
* Add myself to uploaders
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/README.Debian 2004/08/13 08:37:23 1.1.1.1
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/README.Debian 2005/11/07 18:35:07 1.2
@@ -6,8 +6,8 @@
Some information from the INSTALL documentation:
-4) You can now test your installation by first compiling the following
- simple program.
+You can now test your installation by first compiling the following
+simple program.
import org.apache.log4j.Logger;
import org.apache.log4j.BasicConfigurator;
@@ -21,30 +21,19 @@
void main(String argv[]) {
BasicConfigurator.configure();
logger.debug("Hello world.");
- logger.info("What a beatiful day.");
+ logger.info("What a beautiful day.");
}
}
-
After compilation, try it out by issuing the command
java Hello
You should see log statements appearing on the console.
-5) Refer to the javadoc documentation and the user manual on how to
- include log statements in your own code.
+Refer to the javadoc documentation and the user manual on how to
+include log statements in your own code.
-=========
-JAR files
-=========
-
-The log4j distribution comes with one jar file: log4j-VERSION.jar
-under the LOG4J_HOME/dist/lib/ directory.
-
-This jar file contains all the class files of the log4j project,
-except test cases and classes from the "examples" and
-"org.apache.log4j.performance" packages.
==================
log4j dependencies
@@ -65,9 +54,6 @@
parser. Compiling the DOMConfigurator requires the presence of a
JAXP parser in the classpath.
- Log4j is shipped with jaxp.jar and parser.jar files under the
- build/lib/ directory.
-
------------
SMTPAppender
------------
@@ -92,15 +78,4 @@
http://java.sun.com/products/jms/vendors.html
- -----------------------
- JUnit testing framework
- -----------------------
-
- Log4j uses the JUnit framework version 3.7 for internal unit
- testing. If you want to compile the source code in the tests/
- directory, then you will need JUnit. JUnit is available from:
-
- http://www.junit.org
-
-
-- Benoit Joly <benoit at kaitain.dune.local>, Sat Apr 12 18:36:10 2003
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/changelog 2004/11/13 14:04:15 1.5
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/changelog 2005/11/07 18:35:07 1.6
@@ -1,3 +1,18 @@
+jakarta-log4j1.2 (1.2.12-1) unstable; urgency=low
+
+ * New upstream release (closes: #328253)
+ + Apache License 2.0 - updated debian/copyright
+ * Use kaffe for building instead of jikes alone
+ Fixes the FTBS (closes: #334634)
+ * Remove useless parts from README.Debian
+ * Standards-Version 3.6.2 (no changes)
+ * Don't depend on java-common
+ * Remove outdated log4j 1.1 section from description
+ * Register manual with doc-base
+ * Add myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 28 Oct 2005 21:52:06 +0200
+
jakarta-log4j1.2 (1.2.9-1) unstable; urgency=low
* New upstream version (differs from 1.2.8 only in that some methods
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/control 2004/08/13 08:37:23 1.1.1.1
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/control 2005/11/07 18:35:07 1.2
@@ -2,14 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Kalle Kivimaa <killer at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes, fastjar, gjdoc, libcrimson-java, libjaxp1.2-java, libgnujaf-java, libgnumail-java
-Standards-Version: 3.6.1.0
+Uploaders: Kalle Kivimaa <killer at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), kaffe, libcrimson-java, libjaxp1.2-java, libgnujaf-java, libgnumail-java
+Standards-Version: 3.6.2
Package: liblog4j1.2-java
Architecture: all
Section: libs
-Depends: java-common, kaffe | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime
Description: Logging library for java
log4j is a tool to help the programmer output log statements to a variety of
output targets.
@@ -30,9 +30,6 @@
The format of the output can be defined using one of the various layout
(or user defined layout) like: simple text, html, date, pattern defined and
XML.
- .
- This package includes version 1.2 of the log4j implementation.
- See liblog4j-java for implementation of log4j version 1.1.
.
For more details, see http://jakarta.apache.org/log4j
@@ -42,5 +39,4 @@
Description: Documentation for liblog4j1.2-java
The javadoc api documentation for the logging library
from the Apache Jakarta project. The documentation is
- for the version 1.2 of the log4j API. See liblog4j-java-doc
- for API version 1.1 documentation.
+ for the version 1.2 of the log4j API.
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/copyright 2004/08/13 08:37:23 1.1.1.1
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/copyright 2005/11/07 18:35:08 1.2
@@ -18,49 +18,178 @@
Copyright:
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, 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 acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "log4j" 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
- apache at apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- 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 (INCLU-
- DING, 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/>.
+
+ 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.
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/liblog4j1.2-java.links 2004/08/13 08:37:23 1.1.1.1
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/liblog4j1.2-java.links 2005/11/07 18:35:08 1.2
@@ -1 +1 @@
-usr/share/java/log4j-1.2.8.jar usr/share/java/log4j-1.2.jar
+usr/share/java/log4j-1.2.12.jar usr/share/java/log4j-1.2.jar
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/rules 2004/11/13 14:04:15 1.6
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/rules 2005/11/07 18:35:08 1.7
@@ -1,17 +1,15 @@
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-VERSION=1.2.8
+VERSION=1.2.12
JARNAME=log4j
+JAVA_HOME=/usr/lib/kaffe
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -26,9 +24,9 @@
# Add here commands to compile the package.
mkdir -p dist/classes
- jikes -classpath /usr/lib/kaffe/jre/lib/rt.jar:/usr/share/java/activation.jar:/usr/share/java/gnumail.jar:/usr/share/java/jaxp-1.2.jar:/usr/share/java/crimson.jar -sourcepath src/java -d dist/classes @list.sources
+ $(JAVA_HOME)/bin/javac -classpath /usr/share/java/activation.jar:/usr/share/java/gnumail.jar:/usr/share/java/jaxp-1.2.jar:/usr/share/java/crimson.jar -sourcepath src/java -d dist/classes @list.sources
cp src/java/org/apache/log4j/xml/log4j.dtd dist/classes/org/apache/log4j/xml/
- fastjar -cf dist/lib/${JARNAME}-${VERSION}.jar -C dist/classes org
+ $(JAVA_HOME)/bin/jar -cf dist/lib/${JARNAME}-${VERSION}.jar -C dist/classes org
# gjdoc -d docs/api -sourcepath src/java `(cd src/java ; find . -type d | sed -e 's!./!!' -e 's!/!.!g' | grep org | grep -v test )`
touch build-stamp
@@ -63,7 +61,7 @@
dh_installdocs -i docs
rm -rf debian/liblog4j1.2-java/usr/share/doc/liblog4j1.2-java/docs
dh_installexamples -i
- dh_installchangelogs -i docs/HISTORY
+ dh_installchangelogs -i docs/HISTORY.txt
dh_link -i
dh_compress -i
dh_fixperms -i
More information about the pkg-java-commits
mailing list