--- libcommons-logging-java-1.1.orig/debian/docs +++ libcommons-logging-java-1.1/debian/docs @@ -0,0 +1,2 @@ +STATUS.html +dist/docs/api --- libcommons-logging-java-1.1.orig/debian/control +++ libcommons-logging-java-1.1/debian/control @@ -0,0 +1,21 @@ +Source: libcommons-logging-java +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Java Maintainers +Uploaders: Arnaud Vandyck , Michael Koch , Kumar Appaiah , Varun Hiremath +Build-Depends: debhelper (>= 5), cdbs +Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, java-gcj-compat-dev, junit, libservlet2.3-java +Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging +XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging +Homepage: http://commons.apache.org/logging + +Package: libcommons-logging-java +Architecture: all +Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.3-java +Suggests: liblog4j1.2-java, liblogkit-java, libavalon-framework-java +Description: commmon wrapper interface for several logging APIs + Provides a simple, component oriented interface together with wrappers for + several existing java logging systems. The user can choose at runtime which + system they want to use for logging. --- libcommons-logging-java-1.1.orig/debian/rules +++ libcommons-logging-java-1.1/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f +# debian/rules file for libcommons-logging-java (uses cdbs) + +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 := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit + +DEB_ANT_BUILD_TARGET := dist + +install/libcommons-logging-java:: + dh_install target/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging.jar + dh_install target/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-adapters-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-adapters.jar + dh_install target/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/commons-logging-api-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-logging-api.jar + --- libcommons-logging-java-1.1.orig/debian/watch +++ libcommons-logging-java-1.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.apache.org/dist/jakarta/commons/logging/source/commons-logging-(.*)-src\.tar\.gz debian uupdate --- libcommons-logging-java-1.1.orig/debian/changelog +++ libcommons-logging-java-1.1/debian/changelog @@ -0,0 +1,135 @@ +libcommons-logging-java (1.1-1ubuntu1) hardy; urgency=low + + * Synchronize with Debian. Remaining ubuntu changes: + - Drop build dependency libavalon-framework-java, since it is in + multiverse. + + -- Martin Pitt Tue, 23 Oct 2007 16:38:51 +0200 + +libcommons-logging-java (1.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Add Varun Hiremath and Kumar Appaiah as uploaders. + + Add Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields. + + Move cdbs and debhelper to Build-Depends, rest to Build-Depends-Indep. + + Build-Depend and Depend on libservlet2.3-java. + * debian/links: Removed, functionality in debian/rules. + * debian/dirs: Removed, functionality in debian/rules. + * debian/compat: Bump to 5. + * debian/patches/01_target13_BuildXml.patch: updated for new upstream release. + * debian/patches/02_build_javadoc.patch: Added for building API docs through build.xml. + * debian/watch: Bump to version 3. + * debian/copyright: + + Add copyright, upstream authors. + + Add Debian packaging copyright. + + -- Kumar Appaiah Wed, 26 Sep 2007 06:51:56 +0530 + +libcommons-logging-java (1.0.4-6) unstable; urgency=low + + * Use java-gcj-compat instead of kaffe. + * Moved Build-Depends-Indep to Build-Depends. + * Removed Wolfgang and added myself to Uploaders. + * Updated Standards-Version. + + -- Michael Koch Sun, 17 Jun 2007 14:06:07 -0100 + +libcommons-logging-java (1.0.4-5) unstable; urgency=low + + * Removed Takashi Okamoto from uploaders (closes: #352985). + * debian/watch: added. + * debian/rules: removed ant-launcher.jar from the classpath. + + -- Arnaud Vandyck Mon, 24 Apr 2006 21:52:32 +0200 + +libcommons-logging-java (1.0.4-4) unstable; urgency=low + + * kaffe compiler transition + + -- Wolfgang Baer Sun, 15 Jan 2006 17:55:22 +0100 + +libcommons-logging-java (1.0.4-3) unstable; urgency=low + + * Added java1-runtime as alternative to depends (closes: #309030) + * Added liblog4j1.2-java, liblogkit-java and libavalon-framework-java + to Suggests as this is a wrapper library for all these loggers. + * Build javadoc and register with doc-base + * Removed duplicate rules file in top-level dir + * Convert changes to build.xml into a patch (01_target13_BuildXml.patch) + and ant.properties (placed into debian dir) + * Added dependency on libavalon-framework-java to build avalon log wrapper + * Enabled junit tests - added junit build-dep + * Changed libant1.6-java build-dep to ant, ant-optional + * Standards-Version 3.6.2 (no changes) + * Added myself as uploader + + -- Wolfgang Baer Sun, 02 Oct 2005 18:03:25 +0200 + +libcommons-logging-java (1.0.4-2) unstable; urgency=low + + * rebuild with -source 1.3 option to keep compatibility for j2sdk1.3. + + -- Takashi Okamoto Fri, 6 Aug 2004 23:32:14 +0900 + +libcommons-logging-java (1.0.4-1) unstable; urgency=low + + * New upstream release + * fixed FTBFS (closes: #249118) + + -- Takashi Okamoto Tue, 6 Jul 2004 10:30:31 +0900 + +libcommons-logging-java (1.0.3-5) unstable; urgency=low + + * Fixed depends field. + + -- Takashi Okamoto Sun, 2 May 2004 21:42:16 +0900 + +liblibcommons-logging-java (1.0.3-4) unstable; urgency=low + + * Fixed build dependency. + * change maintainer to Debian Java Maintainers. + + -- Takashi Okamoto Sat, 1 May 2004 20:40:35 +0900 + +libcommons-logging-java (1.0.3-3) unstable; urgency=low + + * Move to main. (closes: #237365) + * remove libcommons-logging-java-doc because main tools couldn't + support javadoc. + + -- Takashi Okamoto Sat, 1 May 2004 18:06:52 +0900 + +libcommons-logging-java (1.0.3-2) unstable; urgency=low + + * update depend field for log4j1.2-java.(closes:#191174) + + -- Takashi Okamoto Tue, 29 Apr 2003 12:11:44 +0900 + +libcommons-logging-java (1.0.3-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto Sat, 12 Apr 2003 23:25:34 +0900 + +libcommons-logging-java (1.0.2-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto Sun, 6 Oct 2002 19:22:59 +0900 + +libcommons-logging-java (1.0.1-2) unstable; urgency=low + + * fixed typo(closes: #159998) + + -- Takashi Okamoto Sun, 8 Sep 2002 10:43:02 +0900 + +libcommons-logging-java (1.0.1-1) unstable; urgency=low + + * Initial Release. + + -- Takashi Okamoto Mon, 5 Nov 2001 08:15:04 +0900 + +Local variables: +mode: debian-changelog +End: --- libcommons-logging-java-1.1.orig/debian/compat +++ libcommons-logging-java-1.1/debian/compat @@ -0,0 +1 @@ +5 --- libcommons-logging-java-1.1.orig/debian/patches/02_build_javadoc.patch +++ libcommons-logging-java-1.1/debian/patches/02_build_javadoc.patch @@ -0,0 +1,52 @@ +diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml +--- libcommons-logging-java-1.1/build.xml 2006-05-10 03:15:08.000000000 +0530 ++++ libcommons-logging-java-1.1.new/build.xml 2007-09-25 17:11:20.000000000 +0530 +@@ -613,7 +613,7 @@ + + + +- + + +@@ -772,5 +772,39 @@ + One or more unit tests failed. + + ++ ++ ++ ++ ++ ++ ++ ++ + + --- libcommons-logging-java-1.1.orig/debian/patches/01_target13_BuildXml.patch +++ libcommons-logging-java-1.1/debian/patches/01_target13_BuildXml.patch @@ -0,0 +1,16 @@ +diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml +--- libcommons-logging-java-1.1/build.xml 2006-05-10 03:15:08.000000000 +0530 ++++ libcommons-logging-java-1.1.new/build.xml 2007-09-22 01:08:23.000000000 +0530 +@@ -125,10 +125,10 @@ + + + +- ++ + + +- ++ + + + --- libcommons-logging-java-1.1.orig/debian/copyright +++ libcommons-logging-java-1.1/debian/copyright @@ -0,0 +1,234 @@ +This package was debianized by Takashi Okamoto on +Mon, 5 Nov 2001 08:15:04 +0900. + +It was downloaded from http://jakarta.apache.org/commons/ + +Authors: The Apache Commons Logging Developers + +Various parts of the source code written by: + Brian Stansberry + Costin Manolache + Craig R. McClanahan + Richard A. Sitze + Robert Burrell Donkin + Rod Waldhoff + Sean C. Sullivan + Berin Loritsch + Peter Donald + Neeme Praks + Scott Sanders + Vince Eagen + +Copyright: 2001 - 2006, The Apache Software Foundation. + +License: + + 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. + +Debian packaging: (C) 2001 - 2004, Takashi Okamoto + (C) 2005 - 2007, Arnaud Vandyck , Wolfgang Baer + (C) 2007, Michael Koch, , Varun Hiremath , + Kumar Appaiah + +The Debian packaging of this package is licensed under the Apache +Software License 2.0 (see above). --- libcommons-logging-java-1.1.orig/debian/doc-base +++ libcommons-logging-java-1.1/debian/doc-base @@ -0,0 +1,11 @@ +Document: libcommons-logging-java +Title: Programmer API for Commons Logging +Author: Apache Commons Logging developers +Abstract: A commmon wrapper interface for several logging APIs, providing + a simple, component oriented interface. The user can choose at runtime + which system they want to use for logging. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-logging-java/api/index.html +Files: /usr/share/doc/libcommons-logging-java/api/* --- libcommons-logging-java-1.1.orig/debian/ant.properties +++ libcommons-logging-java-1.1/debian/ant.properties @@ -0,0 +1,7 @@ +log4j.jar=/usr/share/java/log4j-1.2.jar +log4j12.jar=/usr/share/java/log4j-1.2.jar +logkit.jar=/usr/share/java/logkit.jar +avalon-framework.jar=/usr/share/java/avalon-framework.jar +junit.jar=/usr/share/java/junit.jar +servletapi.jar=/usr/share/java/servlet-2.3.jar +test.failonerror=false