[pkg-java] r11123 - trunk/libservlet2.4-java/debian
Niels Thykier
nthykier-guest at alioth.debian.org
Tue Nov 24 23:05:52 UTC 2009
Author: nthykier-guest
Date: 2009-11-24 23:05:51 +0000 (Tue, 24 Nov 2009)
New Revision: 11123
Modified:
trunk/libservlet2.4-java/debian/changelog
trunk/libservlet2.4-java/debian/compat
trunk/libservlet2.4-java/debian/control
trunk/libservlet2.4-java/debian/copyright
Log:
Changes:
[ Niels Thykier ]
* Added myself to uploaders.
* Bumped Standards-Version to 3.8.3.
- Changed section to java.
- Refered to the Apache-2.0 license rather than quoting it.
- Added Homepage and Vcs-* fields.
* Added more alternatives for java in Depends.
* Added missing ${misc:Depends}.
* Bumped debhelper compat to 7.
* Imported the description from tomcat6; it was vastly better than
the previous.
* Added a clause clarifying that the "doc" package only contains
the java API.
Modified: trunk/libservlet2.4-java/debian/changelog
===================================================================
--- trunk/libservlet2.4-java/debian/changelog 2009-11-24 12:32:25 UTC (rev 11122)
+++ trunk/libservlet2.4-java/debian/changelog 2009-11-24 23:05:51 UTC (rev 11123)
@@ -1,12 +1,27 @@
libservlet2.4-java (5.0.30-9) UNRELEASED; urgency=low
+ [ Matthias Klose ]
* Depend on default-jre-headless.
* Merge from Ubuntu:
- Move examples and documentation into a new libservlet2.4-java-doc package.
* Set java source version to 1.4.
- -- Matthias Klose <doko at debian.org> Thu, 31 Jul 2008 11:25:53 +0000
+ [ Niels Thykier ]
+ * Added myself to uploaders.
+ * Bumped Standards-Version to 3.8.3.
+ - Changed section to java.
+ - Refered to the Apache-2.0 license rather than quoting it.
+ - Added Homepage and Vcs-* fields.
+ * Added more alternatives for java in Depends.
+ * Added missing ${misc:Depends}.
+ * Bumped debhelper compat to 7.
+ * Imported the description from tomcat6; it was vastly better than
+ the previous.
+ * Added a clause clarifying that the "doc" package only contains
+ the java API.
+ -- Niels Thykier <niels at thykier.net> Tue, 24 Nov 2009 23:45:17 +0100
+
libservlet2.4-java (5.0.30-8) unstable; urgency=low
* Build-Depend on default-jdk-builddep. Closes: #477888
Modified: trunk/libservlet2.4-java/debian/compat
===================================================================
--- trunk/libservlet2.4-java/debian/compat 2009-11-24 12:32:25 UTC (rev 11122)
+++ trunk/libservlet2.4-java/debian/compat 2009-11-24 23:05:51 UTC (rev 11123)
@@ -1 +1 @@
-4
+7
Modified: trunk/libservlet2.4-java/debian/control
===================================================================
--- trunk/libservlet2.4-java/debian/control 2009-11-24 12:32:25 UTC (rev 11122)
+++ trunk/libservlet2.4-java/debian/control 2009-11-24 23:05:51 UTC (rev 11123)
@@ -1,18 +1,26 @@
Source: libservlet2.4-java
Priority: optional
+Section: java
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 (>= 4.2.30), cdbs, default-jdk-builddep, ant
-Standards-Version: 3.7.3
-Section: libs
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk-builddep, ant
+Standards-Version: 3.8.3
+Homepage: http://jakarta.apache.org/tomcat/index.html
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libservlet2.4-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libservlet2.4-java
Package: libservlet2.4-java
Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
+ java5-jre-headless | java6-jre-headless,
+ ${misc:Depends}
Suggests: libservlet2.4-java-gcj
-Description: Servlet 2.4 and JSP 2.0 Java library.
- For more information about Java servlets please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+Description: Servlet 2.4 and JSP 2.0 Java library
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run. Tomcat 5.5 is the reference
+ implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
.
The official Servlet 2.4 and JSP 2.0 specifications can be found at
http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
@@ -21,19 +29,26 @@
Architecture: any
Depends: libservlet2.4-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Servlet 2.4 and JSP 2.0 Java classes and documentation
- For more information about Java servlets please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run. Tomcat 5.5 is the reference
+ implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
.
This package contains the natively compiled code for use by gij.
Package: libservlet2.4-java-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Replaces: libservlet2.4-java (<< 5.0.30-5ubuntu1)
Suggests: libservlet2.4-java
Description: Servlet 2.4 and JSP 2.0 Java documentation
- For more information about Java servlets please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run. Tomcat 5.5 is the reference
+ implementation for the Java Servlet 2.4 and JavaServer Pages 2.0 technologies.
.
The official Servlet 2.4 and JSP 2.0 specifications can be found at
http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/.
+ .
+ This package contains the java API documentation.
Modified: trunk/libservlet2.4-java/debian/copyright
===================================================================
--- trunk/libservlet2.4-java/debian/copyright 2009-11-24 12:32:25 UTC (rev 11122)
+++ trunk/libservlet2.4-java/debian/copyright 2009-11-24 23:05:51 UTC (rev 11123)
@@ -7,206 +7,7 @@
Copyright: 2005-2008 Apache Foundation
-License:
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+License: Apache 2.0
- 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.
-
+On Debian systems, the complete text of the Apache 2.0 License
+can be found in `/usr/share/common-licenses/Apache-2.0'.
More information about the pkg-java-commits
mailing list