[SCM] OpenJPA: Apache implementation of the Java Persistence API (JPA) branch, master, updated. debian/2.0.0-1-7-g09af4cc
Miguel Landaeta
miguel at miguel.cc
Tue Jun 26 01:40:21 UTC 2012
The following commit has been merged in the master branch:
commit 09af4ccc7489a25c661e26a4f488f82f38a8adc2
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Mon Jun 25 21:18:45 2012 -0430
Update copyright file
diff --git a/debian/changelog b/debian/changelog
index 721c90d..df89dfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openjpa (2.0.1-1) UNRELEASED; urgency=low
* Fix FTBFS with OpenJDK 7.
* Replace dependencies on libpg-java with libpostgresql-jdbc-java.
(Closes: #659398).
+ * Update copyright file.
-- Miguel Landaeta <miguel at miguel.cc> Mon, 25 Jun 2012 21:31:26 -0430
diff --git a/debian/copyright b/debian/copyright
index 4500f78..3f30a6a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,45 @@
-The sources where downloaded from http://www.apache.org/dist/openjpa/2.0.0/apache-openjpa-2.0.0-source.zip.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenJPA
+Upstream-Contact: Apache OpenJPA project
+Source: http://openjpa.apache.org/
Files: *
Copyright: © 2006-2010 Apache Software Foundation (ASF)
License: Apache-2.0
+ 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.
+ .
The full text of the Apache 2.0 license is distributed in
/usr/share/common-licenses/Apache-2.0 on Debian systems.
Files: openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/*.rsrc
-License: GPL-2, CDDL
+License: GPL-2 or CDDL
Copyright: © 2005-2007 Sun Microsystems, Inc
License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
The full text of the GNU General Public License version 2
is distributed in /usr/share/common-licenses/GPL-2 on Debian
systems.
@@ -18,58 +47,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
@@ -78,45 +107,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,
@@ -124,11 +153,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
@@ -136,11 +165,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
@@ -149,24 +178,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
@@ -178,9 +207,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
@@ -193,25 +222,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
@@ -222,18 +251,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,
@@ -244,15 +273,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
@@ -267,14 +296,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
@@ -288,9 +317,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
@@ -301,9 +330,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
@@ -323,9 +352,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
@@ -334,7 +363,7 @@ License: CDDL
liability.
Files: debian/*
-Copyright: © 2010 Miguel Landaeta <miguel at miguel.cc>
+Copyright: © 2010,2012 Miguel Landaeta <miguel at miguel.cc>
License: BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -347,7 +376,7 @@ License: BSD
3. Neither the name of the University 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 REGENTS 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
--
OpenJPA: Apache implementation of the Java Persistence API (JPA)
More information about the pkg-java-commits
mailing list