[mojarra] 01/03: wrap-and-sort -sa
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Aug 25 11:13:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository mojarra.
commit f07ad9f19c836532cbe79aa385d4d35ad35c2cb4
Author: Markus Koschany <apo at gambaru.de>
Date: Mon Aug 25 13:12:09 2014 +0200
wrap-and-sort -sa
---
debian/control | 62 +++++++++++++++++-------
debian/copyright | 144 +++++++++++++++++++++++++++----------------------------
2 files changed, 118 insertions(+), 88 deletions(-)
diff --git a/debian/control b/debian/control
index 0528b0c..15a0979 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,30 @@
Source: mojarra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>
+Uploaders:
+ Miguel Landaeta <miguel at miguel.cc>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 9), default-jdk, javahelper, ant,
- libservlet2.5-java, libgeronimo-validation-1.0-spec-java, glassfish-javaee,
- groovy, libtomcat6-java, libcommons-digester-java, libcommons-logging-java,
- libcommons-beanutils-java, ant-contrib, bnd, yui-compressor, libjetty-java,
- libjetty-extra-java, ant-optional, default-jdk-doc,
- libcommons-collections3-java
+Build-Depends:
+ ant,
+ ant-contrib,
+ ant-optional,
+ bnd,
+ debhelper (>= 9),
+ default-jdk,
+ default-jdk-doc,
+ glassfish-javaee,
+ groovy,
+ javahelper,
+ libcommons-beanutils-java,
+ libcommons-collections3-java,
+ libcommons-digester-java,
+ libcommons-logging-java,
+ libgeronimo-validation-1.0-spec-java,
+ libjetty-extra-java,
+ libjetty-java,
+ libservlet2.5-java,
+ libtomcat6-java,
+ yui-compressor
Standards-Version: 3.9.5
Homepage: https://javaserverfaces.java.net/
Vcs-Git: git://anonscm.debian.org/pkg-java/mojarra.git
@@ -16,9 +32,14 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/mojarra.git
Package: libjsf-api-java
Architecture: all
-Depends: libservlet2.5-java, ${misc:Depends}
-Recommends: libjsf-impl-java (= ${binary:Version})
-Suggests: libjsf-java-doc (= ${binary:Version}), glassfish-javaee
+Depends:
+ libservlet2.5-java,
+ ${misc:Depends}
+Recommends:
+ libjsf-impl-java (= ${binary:Version})
+Suggests:
+ glassfish-javaee,
+ libjsf-java-doc (= ${binary:Version})
Description: JavaServer Faces 2.0 Java EE web framework - API
JavaServer Faces 2.0 (JSF) is a Java-based Web application framework intended
to simplify development integration of web-based user interfaces.
@@ -38,10 +59,16 @@ Description: JavaServer Faces 2.0 Java EE web framework - API
Package: libjsf-impl-java
Architecture: all
-Depends: libjsf-api-java (= ${binary:Version}), libservlet2.5-java,
+Depends:
+ libjsf-api-java (= ${binary:Version}),
+ libservlet2.5-java,
${misc:Depends}
-Suggests: libjsf-java-doc (= ${binary:Version}), groovy, libjetty-java,
- libjetty-extra-java, libtomcat6-java
+Suggests:
+ groovy,
+ libjetty-extra-java,
+ libjetty-java,
+ libjsf-java-doc (= ${binary:Version}),
+ libtomcat6-java
Description: JavaServer Faces 2.0 Java EE web framework - Implementation
JavaServer Faces (JSF) 2.0 is a Java-based Web application framework intended
to simplify development integration of web-based user interfaces.
@@ -61,9 +88,12 @@ Description: JavaServer Faces 2.0 Java EE web framework - Implementation
Package: libjsf-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: libjsf-api-java (= ${binary:Version})
-Suggests: default-jdk-doc
+Depends:
+ ${misc:Depends}
+Recommends:
+ libjsf-api-java (= ${binary:Version})
+Suggests:
+ default-jdk-doc
Description: Documentation for libjsf-api-java
Documentation for JavaServer Faces (JSF) 2.0, that is a Java-based Web
application framework intended to simplify development integration of
diff --git a/debian/copyright b/debian/copyright
index 6d921cb..fbc7513 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,25 +38,25 @@ License: CDDL
Files: jsf-ri/conf/share/tlddoc-resources/*
Copyright: © 2003-2004 Sun Microsystems, Inc.
License: other
- Redistribution and use in source and binary forms, with or without
+ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- .
- * Redistributions of source code must retain the above copyright
+ .
+ * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
+ * 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.
- * Neither the name of Sun Microsystems, Inc. nor the names of its
+ * Neither the name of Sun Microsystems, Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS 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 COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
ROCUREMENT 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
@@ -80,58 +80,58 @@ License: GPL-2
License: CDDL
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
Version 1.0
- .
+ .
1. Definitions.
- .
+ .
1.1. “Contributor” means each individual or entity that creates or contributes
to the creation of Modifications.
- .
+ .
1.2. “Contributor Version” means the combination of the Original Software,
prior Modifications used by a Contributor (if any), and the Modifications made
by that particular Contributor.
- .
+ .
1.3. “Covered Software” means (a) the Original Software, or (b) Modifications,
or (c) the combination of files containing Original Software with files
containing Modifications, in each case including portions thereof.
- .
+ .
1.4. “Executable” means the Covered Software in any form other than Source
Code.
- .
+ .
1.5. “Initial Developer” means the individual or entity that first makes
Original Software available under this License.
- .
+ .
1.6. “Larger Work” means a work which combines Covered Software or portions
thereof with code not governed by the terms of this License.
- .
+ .
1.7. “License” means this document.
- .
+ .
1.8. “Licensable” means having the right to grant, to the maximum extent
possible, whether at the time of the initial grant or subsequently acquired,
any and all of the rights conveyed herein.
- .
+ .
1.9. “Modifications” means the Source Code and Executable form of any of the
following:
- .
+ .
A. Any file that results from an addition to, deletion from or modification of
the contents of a file containing Original Software or previous Modifications;
- .
+ .
B. Any new file that contains any part of the Original Software or previous
Modification; or
- .
+ .
C. Any new file that is contributed or otherwise made available under the
terms of this License.
- .
+ .
1.10. “Original Software” means the Source Code and Executable form of
computer software code that is originally released under this License.
- .
+ .
1.11. “Patent Claims” means any patent claim(s), now owned or hereafter
acquired, including without limitation, method, process, and apparatus claims,
in any patent Licensable by grantor.
- .
+ .
1.12. “Source Code” means (a) the common form of computer software code in
which modifications are made and (b) associated documentation included in or
with such code.
- .
+ .
1.13. “You” (or “Your”) means an individual or a legal entity exercising
rights under, and complying with all of the terms of, this License. For legal
entities, “You” includes any entity which controls, is controlled by, or is
@@ -140,45 +140,45 @@ License: CDDL
of such entity, whether by contract or otherwise, or (b) ownership of more
than fifty percent (50%) of the outstanding shares or beneficial ownership of
such entity.
- .
+ .
2. License Grants.
- .
+ .
2.1. The Initial Developer Grant.
- .
+ .
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, the Initial Developer hereby grants You a
world-wide, royalty-free, non-exclusive license:
- .
+ .
(a) under intellectual property rights (other than patent or trademark)
Licensable by Initial Developer, to use, reproduce, modify, display, perform,
sublicense and distribute the Original Software (or portions thereof), with or
without Modifications, and/or as part of a Larger Work; and
- .
+ .
(b) under Patent Claims infringed by the making, using or selling of Original
Software, to make, have made, use, practice, sell, and offer for sale, and/or
otherwise dispose of the Original Software (or portions thereof).
- .
+ .
(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
Initial Developer first distributes or otherwise makes the Original Software
available to a third party under the terms of this License.
- .
+ .
(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1)
for code that You delete from the Original Software, or (2) for infringements
caused by: (i) the modification of the Original Software, or (ii) the
combination of the Original Software with other software or devices.
- .
+ .
2.2. Contributor Grant.
- .
+ .
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, each Contributor hereby grants You a
world-wide, royalty-free, non-exclusive license:
- .
+ .
(a) under intellectual property rights (other than patent or trademark)
Licensable by Contributor to use, reproduce, modify, display, perform,
sublicense and distribute the Modifications created by such Contributor (or
portions thereof), either on an unmodified basis, with other Modifications, as
Covered Software and/or as part of a Larger Work; and
- .
+ .
(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
@@ -186,11 +186,11 @@ License: CDDL
by that Contributor (or portions thereof); and (2) the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
- .
+ .
(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
date Contributor first distributes or otherwise makes the Modifications
available to a third party.
- .
+ .
(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1)
for any code that Contributor has deleted from the Contributor Version; (2)
for infringements caused by: (i) third party modifications of Contributor
@@ -198,11 +198,11 @@ License: CDDL
with other software (except as part of the Contributor Version) or other
devices; or (3) under Patent Claims infringed by Covered Software in the
absence of Modifications made by that Contributor.
- .
+ .
3. Distribution Obligations.
- .
+ .
3.1. Availability of Source Code.
- .
+ .
Any Covered Software that You distribute or otherwise make available in
Executable form must also be made available in Source Code form and that
Source Code form must be distributed only under the terms of this License. You
@@ -211,24 +211,24 @@ License: CDDL
inform recipients of any such Covered Software in Executable form as to how
they can obtain such Covered Software in Source Code form in a reasonable
manner on or through a medium customarily used for software exchange.
- .
+ .
3.2. Modifications.
- .
+ .
The Modifications that You create or to which You contribute are governed by
the terms of this License. You represent that You believe Your Modifications
are Your original creation(s) and/or You have sufficient rights to grant the
rights conveyed by this License.
- .
+ .
3.3. Required Notices.
- .
+ .
You must include a notice in each of Your Modifications that identifies You as
the Contributor of the Modification. You may not remove or alter any
copyright, patent or trademark notices contained within the Covered Software,
or any notices of licensing or any descriptive text giving attribution to any
Contributor or the Initial Developer.
- .
+ .
3.4. Application of Additional Terms.
- .
+ .
You may not offer or impose any terms on any Covered Software in Source Code
form that alters or restricts the applicable version of this License or the
recipients’ rights hereunder. You may choose to offer, and to charge a fee
@@ -240,9 +240,9 @@ License: CDDL
indemnify the Initial Developer and every Contributor for any liability
incurred by the Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.
- .
+ .
3.5. Distribution of Executable Versions.
- .
+ .
You may distribute the Executable form of the Covered Software under the terms
of this License or under the terms of a license of Your choice, which may
contain terms different from this License, provided that You are in compliance
@@ -255,25 +255,25 @@ License: CDDL
indemnify the Initial Developer and every Contributor for any liability
incurred by the Initial Developer or such Contributor as a result of any such
terms You offer.
- .
+ .
3.6. Larger Works.
- .
+ .
You may create a Larger Work by combining Covered Software with other code not
governed by the terms of this License and distribute the Larger Work as a
single product. In such a case, You must make sure the requirements of this
License are fulfilled for the Covered Software.
- .
+ .
4. Versions of the License.
- .
+ .
4.1. New Versions.
- .
+ .
Sun Microsystems, Inc. is the initial license steward and may publish revised
and/or new versions of this License from time to time. Each version will be
given a distinguishing version number. Except as provided in Section 4.3, no
one other than the license steward has the right to modify this License.
- .
+ .
4.2. Effect of New Versions.
- .
+ .
You may always continue to use, distribute or otherwise make the Covered
Software available under the terms of the version of the License under which
You originally received the Covered Software. If the Initial Developer
@@ -284,18 +284,18 @@ License: CDDL
Covered Software. Otherwise, You may also choose to use, distribute or
otherwise make the Covered Software available under the terms of any
subsequent version of the License published by the license steward.
- .
+ .
4.3. Modified Versions.
- .
+ .
When You are an Initial Developer and You want to create a new license for
Your Original Software, You may create and use a modified version of this
License if You: (a) rename the license and remove any references to the name
of the license steward (except to note that the license differs from this
License); and (b) otherwise make it clear that the license contains terms
which differ from this License.
- .
+ .
5. DISCLAIMER OF WARRANTY.
- .
+ .
COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
@@ -306,15 +306,15 @@ License: CDDL
SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
- .
+ .
6. TERMINATION.
- .
+ .
6.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure such
breach within 30 days of becoming aware of the breach. Provisions which, by
their nature, must remain in effect beyond the termination of this License
shall survive.
- .
+ .
6.2. If You assert a patent infringement claim (excluding declaratory judgment
actions) against Initial Developer or a Contributor (the Initial Developer or
Contributor against whom You assert such claim is referred to as
@@ -329,14 +329,14 @@ License: CDDL
within such 60 day period You withdraw Your claim with respect to the
Participant Software against such Participant either unilaterally or pursuant
to a written agreement with Participant.
- .
+ .
6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user
licenses that have been validly granted by You or any distributor hereunder
prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
- .
+ .
7. LIMITATION OF LIABILITY.
- .
+ .
UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
@@ -350,9 +350,9 @@ License: CDDL
APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
- .
+ .
8. U.S. GOVERNMENT END USERS.
- .
+ .
The Covered Software is a “commercial item,” as that term is defined in 48
C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as
that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial
@@ -363,9 +363,9 @@ License: CDDL
clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or
provision that addresses Government rights in computer software under this
License.
- .
+ .
9. MISCELLANEOUS.
- .
+ .
This License represents the complete agreement concerning subject matter
hereof. If any provision of this License is held to be unenforceable, such
provision shall be reformed only to the extent necessary to make it
@@ -385,9 +385,9 @@ License: CDDL
regulations (and the export control laws and regulation of any other
countries) when You use, distribute or otherwise make available any Covered
Software.
- .
+ .
10. RESPONSIBILITY FOR CLAIMS.
- .
+ .
As between Initial Developer and the Contributors, each party is responsible
for claims and damages arising, directly or indirectly, out of its utilization
of rights under this License and You agree to work with Initial Developer and
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git
More information about the pkg-java-commits
mailing list