[h2database] 02/02: New upstream release (1.4.185)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Feb 17 13:42:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository h2database.
commit d18e5136b26fd9b6595404731c41726c18c95eae
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Feb 17 14:34:36 2015 +0100
New upstream release (1.4.185)
---
debian/changelog | 4 +-
debian/control | 55 +-
debian/copyright | 770 ++++++++++-----------
debian/libh2-java.classpath | 2 +-
debian/orig-tar.sh | 1 -
...an.patch => 01-use-jar-files-from-debian.patch} | 16 +-
debian/patches/02-servlet-api-compatibility.patch | 5 +-
debian/patches/03-java8-compatibility.patch | 13 -
debian/patches/03-osgi-compatibility.patch | 14 +
debian/patches/04-jts-compatibility.patch | 30 +
debian/patches/series | 5 +-
debian/rules | 6 +-
12 files changed, 473 insertions(+), 448 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 08d5796..9954fb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-h2database (1.3.157-1) unstable; urgency=low
+h2database (1.4.185-1) unstable; urgency=low
* Initial release. (Closes: #607891)
- -- Sebastian Reichel <sre at debian.org> Fri, 19 Aug 2011 01:30:04 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 17 Feb 2015 08:16:31 +0100
diff --git a/debian/control b/debian/control
index ac26bd2..b0b33cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,18 @@
Source: h2database
Section: java
-Priority: extra
-Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Sebastian Reichel <sre at debian.org>
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>
Build-Depends: debhelper (>= 9),
+ default-jdk,
javahelper,
+ libequinox-osgi-java,
+ libjts-java,
+ liblucene3-java,
+ libosgi-compendium-java,
+ libservlet2.5-java,
+ libslf4j-java,
maven-repo-helper
-Build-Depends-Indep: default-jdk,
- liblucene2-java,
- libservlet2.5-java,
- libslf4j-java,
- libequinox-osgi-java
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/h2database.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/h2database.git
@@ -18,33 +20,38 @@ Homepage: http://www.h2database.com
Package: libh2-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: relational database management system written in Java
- H2 supports a subset of the SQL standard. The main
- programming APIs are SQL and JDBC, however the database
- also supports using the PostgreSQL ODBC driver by acting
- like a PostgreSQL server. The main features of H2 are:
+Depends: ${misc:Depends}
+Suggests: libjts-java, liblucene3-java, libslf4j-java
+Description: H2 Database Engine
+ H2 is a relational database management system supporting a subset
+ of the SQL standard. The main programming APIs are SQL and JDBC,
+ however the database also supports using the PostgreSQL ODBC driver
+ by acting like a PostgreSQL server.
+ .
+ The main features of H2 are:
.
- Very fast, open source, JDBC API.
- Embedded and server modes; in-memory databases.
- Browser based Console application.
- - Small footprint: around 1 MB jar file size.
+ - Small footprint
Package: libh2-java-doc
Architecture: all
Section: doc
-Depends: default-jdk-doc, ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
Suggests: libh2-java
-Description: Documentation for libh2-java
- H2 supports a subset of the SQL standard. The main
- programming APIs are SQL and JDBC, however the database
- also supports using the PostgreSQL ODBC driver by acting
- like a PostgreSQL server. The main features of H2 are:
+Description: H2 Database Engine (documentation)
+ H2 is a relational database management system supporting a subset
+ of the SQL standard. The main programming APIs are SQL and JDBC,
+ however the database also supports using the PostgreSQL ODBC driver
+ by acting like a PostgreSQL server.
+ .
+ The main features of H2 are:
.
- Very fast, open source, JDBC API.
- Embedded and server modes; in-memory databases.
- Browser based Console application.
- - Small footprint: around 1 MB jar file size.
+ - Small footprint
.
- This package includes the API javadoc.
+ This package includes the API documentation.
diff --git a/debian/copyright b/debian/copyright
index eaa5316..d35f8e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,21 +3,30 @@ Upstream-Name: H2
Source: http://www.h2database.com
Files: *
-Copyright: 2004-2011 H2 Group
-License: EPL-1.0 or H2
+Copyright: 2004-2014, H2 Group
+License: MPL-2.0 or EPL-1.0
Files: src/main/org/h2/jdbcx/JdbcConnectionPool.java
Copyright: 2007-2011, Christian d'Heureuse
- 2007-2011, H2 Group
-License: H2 or LGPL-3+
+ 2007-2014, H2 Group
+License: MPL-2.0 or EPL-1.0 or LGPL-3+
Comment:
Adapted from the MiniConnectionPoolManager class by Christian d'Heureuse
http://www.source-code.biz/miniconnectionpoolmanager/MiniConnectionPoolManager.java.txt
+Files: src/test/org/h2/test/trace/*
+Copyright: 2007-2014, H2 Group
+License: MPL-2.0 or EPL-1.0 or Apache-2.0
+
Files: debian/*
-Copyright: 2011 Sebastian Reichel <sre at debian.org>
+Copyright: 2011, Sebastian Reichel <sre at debian.org>
+ 2015, Emmanuel Bourg <ebourg at apache.org>
License: ISC
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
License: LGPL-3+
This module is free software: you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -248,412 +257,381 @@ License: EPL-1.0
after the cause of action arose. Each party waives its rights to a jury trial
in any resulting litigation.
-License: H2
- H2 License - Version 1.0
+License: MPL-2.0
+ Mozilla Public License Version 2.0
+ ==================================
.
1. Definitions
+ --------------
+ .
+ 1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+ .
+ 1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+ .
+ 1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+ .
+ 1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+ .
+ 1.5. "Incompatible With Secondary Licenses"
+ means
+ .
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+ .
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
.
- 1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code
- available to a third party.
+ 1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
.
- 1.1. "Contributor" means each entity that creates or contributes to the
- creation of Modifications.
+ 1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
.
- 1.2. "Contributor Version" means the combination of the Original Code, prior
- Modifications used by a Contributor, and the Modifications made by that
- particular Contributor.
+ 1.8. "License"
+ means this document.
.
- 1.3. "Covered Code" means the Original Code or Modifications or the combination
- of the Original Code and Modifications, in each case including portions
- thereof.
+ 1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
.
- 1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted
- in the software development community for the electronic transfer of data.
+ 1.10. "Modifications"
+ means any of the following:
.
- 1.5. "Executable" means Covered Code in any form other than Source Code.
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
.
- 1.6. "Initial Developer" means the individual or entity identified as the
- Initial Developer in the Source Code notice required by Exhibit A.
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
.
- 1.7. "Larger Work" means a work which combines Covered Code or portions thereof
- with code not governed by the terms of this License.
+ 1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
.
- 1.8. "License" means this document.
+ 1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
.
- 1.8.1. "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.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
.
- 1.9. "Modifications" means any addition to or deletion from the substance or
- structure of either the Original Code or any previous Modifications. When
- Covered Code is released as a series of files, a Modification is:
- .
- 1.9.a. Any addition to or deletion from the contents of a file containing
- Original Code or previous Modifications.
+ 1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management 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.
.
- 1.9.b. Any new file that contains any part of the Original Code or previous
- Modifications.
+ 2. License Grants and Conditions
+ --------------------------------
.
- 1.10. "Original Code" means Source Code of computer software code which is
- described in the Source Code notice required by Exhibit A as Original Code, and
- which, at the time of its release under this License is not already Covered
- Code governed by this License.
- .
- 1.10.1. "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.11. "Source Code" means the preferred form of the Covered Code for making
- modifications to it, including all modules it contains, plus any associated
- interface definition files, scripts used to control compilation and
- installation of an Executable, or source code differential comparisons against
- either the Original Code or another well known, available Covered Code of the
- Contributor's choice. The Source Code can be in a compressed or archival form,
- provided the appropriate decompression or de-archiving software is widely
- available for no charge.
- .
- 1.12. "You" (or "Your") means an individual or a legal entity exercising rights
- under, and complying with all of the terms of, this License or a future version
- of this License issued under Section 6.1. For legal entities, "You" includes
- any entity which controls, is controlled by, or is under common control with
- You. For purposes of this definition, "control" means (a) the power, direct or
- indirect, to cause the direction or management 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. Source Code License
- .
- 2.1. The Initial Developer Grant
- .
- The Initial Developer hereby grants You a world-wide, royalty-free,
- non-exclusive license, subject to third party intellectual property claims:
- .
- 2.1.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 Code (or portions thereof) with or
- without Modifications, and/or as part of a Larger Work; and
- .
- 2.1.b. under Patents Claims infringed by the making, using or selling of
- Original Code, to make, have made, use, practice, sell, and offer for sale,
- and/or otherwise dispose of the Original Code (or portions thereof).
- .
- 2.1.c. the licenses granted in this Section 2.1 (a) and (b) are effective on
- the date Initial Developer first distributes Original Code under the terms of
- this License.
- .
- 2.1.d. Notwithstanding Section 2.1 (b) above, no patent license is granted: 1)
- for code that You delete from the Original Code; 2) separate from the Original
- Code; or 3) for infringements caused by: i) the modification of the Original
- Code or ii) the combination of the Original Code with other software or
- devices.
- .
- 2.2. Contributor Grant
- .
- Subject to third party intellectual property claims, each Contributor hereby
- grants You a world-wide, royalty-free, non-exclusive license
- .
- 2.2.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 Code and/or as part of a Larger Work; and
- .
- 2.2.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,
- offer for sale, have made, and/or otherwise dispose of: 1) Modifications made
- 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).
- .
- 2.2.c. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective on
- the date Contributor first makes Commercial Use of the Covered Code.
- .
- 2.2.c. Notwithstanding Section 2.2 (b) above, no patent license is granted: 1)
- for any code that Contributor has deleted from the Contributor Version; 2)
- separate from the Contributor Version; 3) for infringements caused by: i) third
- party modifications of Contributor Version or ii) the combination of
- Modifications made by that Contributor with other software (except as part of
- the Contributor Version) or other devices; or 4) under Patent Claims infringed
- by Covered Code in the absence of Modifications made by that Contributor.
- .
- 3. Distribution Obligations
- .
- 3.1. Application of License
- .
- The Modifications which You create or to which You contribute are governed by
- the terms of this License, including without limitation Section 2.2. The Source
- Code version of Covered Code may be distributed only under the terms of this
- License or a future version of this License released under Section 6.1, and You
- must include a copy of this License with every copy of the Source Code You
- distribute. You may not offer or impose any terms on any Source Code version
- that alters or restricts the applicable version of this License or the
- recipients' rights hereunder. However, You may include an additional document
- offering the additional rights described in Section 3.5.
- .
- 3.2. Availability of Source Code
- .
- Any Modification which You create or to which You contribute must be made
- available in Source Code form under the terms of this License either on the
- same media as an Executable version or via an accepted Electronic Distribution
- Mechanism to anyone to whom you made an Executable version available; and if
- made available via Electronic Distribution Mechanism, must remain available for
- at least twelve (12) months after the date it initially became available, or at
- least six (6) months after a subsequent version of that particular Modification
- has been made available to such recipients. You are responsible for ensuring
- that the Source Code version remains available even if the Electronic
- Distribution Mechanism is maintained by a third party.
- .
- 3.3. Description of Modifications
- .
- You must cause all Covered Code to which You contribute to contain a file
- documenting the changes You made to create that Covered Code and the date of
- any change. You must include a prominent statement that the Modification is
- derived, directly or indirectly, from Original Code provided by the Initial
- Developer and including the name of the Initial Developer in (a) the Source
- Code, and (b) in any notice in an Executable version or related documentation
- in which You describe the origin or ownership of the Covered Code.
- .
- 3.4. Intellectual Property Matters
- .
- 3.4.a. Third Party Claims: If Contributor has knowledge that a license under a
- third party's intellectual property rights is required to exercise the rights
- granted by such Contributor under Sections 2.1 or 2.2, Contributor must include
- a text file with the Source Code distribution titled "LEGAL" which describes
- the claim and the party making the claim in sufficient detail that a recipient
- will know whom to contact. If Contributor obtains such knowledge after the
- Modification is made available as described in Section 3.2, Contributor shall
- promptly modify the LEGAL file in all copies Contributor makes available
- thereafter and shall take other steps (such as notifying appropriate mailing
- lists or newsgroups) reasonably calculated to inform those who received the
- Covered Code that new knowledge has been obtained.
- .
- 3.4.b. Contributor APIs: If Contributor's Modifications include an application
- programming interface and Contributor has knowledge of patent licenses which
- are reasonably necessary to implement that API, Contributor must also include
- this information in the legal file.
- .
- 3.4.c. Representations: Contributor represents that, except as disclosed
- pursuant to Section 3.4 (a) above, Contributor believes that Contributor's
- Modifications are Contributor's original creation(s) and/or Contributor has
- sufficient rights to grant the rights conveyed by this License.
- .
- 3.5. Required Notices
- .
- You must duplicate the notice in Exhibit A in each file of the Source Code. If
- it is not possible to put such notice in a particular Source Code file due to
- its structure, then You must include such notice in a location (such as a
- relevant directory) where a user would be likely to look for such a notice. If
- You created one or more Modification(s) You may add your name as a Contributor
- to the notice described in Exhibit A. You must also duplicate this License in
- any documentation for the Source Code where You describe recipients' rights or
- ownership rights relating to Covered Code. You may choose to offer, and to
- charge a fee for, warranty, support, indemnity or liability obligations to one
- or more recipients of Covered Code. However, You may do so only on Your own
- behalf, and not on behalf of the Initial Developer or any Contributor. You must
- make it absolutely clear than any such warranty, support, indemnity or
- liability obligation is offered by You alone, and You hereby agree to 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.6. Distribution of Executable Versions
- .
- You may distribute Covered Code in Executable form only if the requirements of
- Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for that Covered Code, and if
- You include a notice stating that the Source Code version of the Covered Code
- is available under the terms of this License, including a description of how
- and where You have fulfilled the obligations of Section 3.2. The notice must be
- conspicuously included in any notice in an Executable version, related
- documentation or collateral in which You describe recipients' rights relating
- to the Covered Code. You may distribute the Executable version of Covered Code
- or ownership rights under a license of Your choice, which may contain terms
- different from this License, provided that You are in compliance with the terms
- of this License and that the license for the Executable version does not
- attempt to limit or alter the recipient's rights in the Source Code version
- from the rights set forth in this License. If You distribute the Executable
- version under a different license You must make it absolutely clear that any
- terms which differ from this License are offered by You alone, not by the
- Initial Developer or any Contributor. You hereby agree to 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.7. Larger Works
- .
- You may create a Larger Work by combining Covered Code 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 Code.
- .
- 4. Inability to Comply Due to Statute or Regulation.
- .
- If it is impossible for You to comply with any of the terms of this License
- with respect to some or all of the Covered Code due to statute, judicial order,
- or regulation then You must: (a) comply with the terms of this License to the
- maximum extent possible; and (b) describe the limitations and the code they
- affect. Such description must be included in the legal file described in
- Section 3.4 and must be included with all distributions of the Source Code.
- Except to the extent prohibited by statute or regulation, such description must
- be sufficiently detailed for a recipient of ordinary skill to be able to
- understand it.
- .
- 5. Application of this License.
- .
- This License applies to code to which the Initial Developer has attached the
- notice in Exhibit A and to related Covered Code.
- .
- 6. Versions of the License.
- .
- 6.1. New Versions
- .
- The H2 Group may publish revised and/or new versions of the License from time
- to time. Each version will be given a distinguishing version number.
- .
- 6.2. Effect of New Versions
- .
- Once Covered Code has been published under a particular version of the License,
- You may always continue to use it under the terms of that version. You may also
- choose to use such Covered Code under the terms of any subsequent version of
- the License published by the H2 Group. No one other than the H2 Group has the
- right to modify the terms applicable to Covered Code created under this
- License.
- .
- 6.3. Derivative Works
- .
- If You create or use a modified version of this License (which you may only do
- in order to apply it to code which is not already Covered Code governed by this
- License), You must (a) rename Your license so that the phrases "H2 Group", "H2"
- or any confusingly similar phrase do not appear in your license (except to note
- that your license differs from this License) and (b) otherwise make it clear
- that Your version of the license contains terms which differ from the H2
- License. (Filling in the name of the Initial Developer, Original Code or
- Contributor in the notice described in Exhibit A shall not of themselves be
- deemed to be modifications of this License.)
- .
- 7. Disclaimer of Warranty
- .
- Covered code 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 code is free of defects, merchantable,
- fit for a particular purpose or non-infringing. The entire risk as to the
- quality and performance of the covered code is with you. Should any covered
- code prove defective in any respect, you (not the initial developer or any
- other contributor) assume the cost of any necessary servicing, repair or
- correction. This disclaimer of warranty constitutes an essential part of this
- license. No use of any covered code is authorized hereunder except under this
- disclaimer.
- .
- 8. Termination
- .
- 8.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. All sublicenses to the Covered Code which
- are properly granted shall survive any termination of this License. Provisions
- which, by their nature, must remain in effect beyond the termination of this
- License shall survive.
- .
- 8.2. If You initiate litigation by asserting a patent infringement claim
- (excluding declaratory judgment actions) against Initial Developer or a
- Contributor (the Initial Developer or Contributor against whom You file such
- action is referred to as "Participant") alleging that:
- .
- 8.2.a. such Participant's Contributor Version directly or indirectly infringes
- any patent, then any and all rights granted by such Participant to You under
- Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from
- Participant terminate prospectively, unless if within 60 days after receipt of
- notice You either: (i) agree in writing to pay Participant a mutually agreeable
- reasonable royalty for Your past and future use of Modifications made by such
- Participant, or (ii) withdraw Your litigation claim with respect to the
- Contributor Version against such Participant. If within 60 days of notice, a
- reasonable royalty and payment arrangement are not mutually agreed upon in
- writing by the parties or the litigation claim is not withdrawn, the rights
- granted by Participant to You under Sections 2.1 and/or 2.2 automatically
- terminate at the expiration of the 60 day notice period specified above.
- .
- 8.2.b. any software, hardware, or device, other than such Participant's
- Contributor Version, directly or indirectly infringes any patent, then any
- rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
- revoked effective as of the date You first made, used, sold, distributed, or
- had made, Modifications made by that Participant.
- .
- 8.3. If You assert a patent infringement claim against Participant alleging
- that such Participant's Contributor Version directly or indirectly infringes
- any patent where such claim is resolved (such as by license or settlement)
- prior to the initiation of patent infringement litigation, then the reasonable
- value of the licenses granted by such Participant under Sections 2.1 or 2.2
- shall be taken into account in determining the amount or value of any payment
- or license.
- .
- 8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user
- license agreements (excluding distributors and resellers) which have been
- validly granted by You or any distributor hereunder prior to termination shall
- survive termination.
- .
- 9. 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 code, or any supplier of any
- of such parties, be liable to any person for any indirect, special, incidental,
- or consequential damages of any character including, without limitation,
- damages for loss of goodwill, work stoppage, computer failure or malfunction,
- or any and all other commercial damages or losses, even if such party shall
- have been informed of the possibility of such damages. This limitation of
- liability shall not apply to liability for death or personal injury resulting
- from such party's negligence to the extent 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.
- .
- 10. United States Government End Users
- .
- The Covered Code is a "commercial item", as that term is defined in 48 C.F.R.
- 2.101 (October 1995), consisting of "commercial computer software" and
- "commercial computer software documentation", as such terms are used in 48
- C.F.R. 12.212 (September 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
- 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Code with only those rights set forth herein.
- .
- 11. 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
- enforceable. This License shall be governed by California law provisions
- (except to the extent applicable law, if any, provides otherwise), excluding
- its conflict-of-law provisions. With respect to disputes in which at least one
- party is a citizen of, or an entity chartered or registered to do business in
- United States of America, any litigation relating to this License shall be
- subject to the jurisdiction of the Federal Courts of the Northern District of
- California, with venue lying in Santa Clara County, California, with the losing
- party responsible for costs, including without limitation, court costs and
- reasonable attorneys' fees and expenses. The application of the United Nations
- Convention on Contracts for the International Sale of Goods is expressly
- excluded. Any law or regulation which provides that the language of a contract
- shall be construed against the drafter shall not apply to this License.
- .
- 12. 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
- Contributors to distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission of liability.
- .
- 13. Multiple-Licensed Code
- .
- Initial Developer may designate portions of the Covered Code as
- "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer
- permits you to utilize portions of the Covered Code under Your choice of this
- or the alternative licenses, if any, specified by the Initial Developer in the
- file described in Exhibit A.
- .
- Exhibit A
- .
- Multiple-Licensed under the H2 License, Version 1.0,
- and under the Eclipse Public License, Version 1.0
- (http://h2database.com/html/license.html).
- Initial Developer: H2 Group
+ 2.1. Grants
+ .
+ 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 such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+ .
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+ .
+ 2.2. Effective Date
+ .
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ .
+ 2.3. Limitations on Grant Scope
+ .
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ .
+ (a) for any code that a Contributor has removed from Covered Software;
+ or
+ .
+ (b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+ .
+ (c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+ .
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ .
+ 2.4. Subsequent Licenses
+ .
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ .
+ 2.5. Representation
+ .
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ .
+ 2.6. Fair Use
+ .
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ .
+ 2.7. Conditions
+ .
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ .
+ 3. Responsibilities
+ -------------------
+ .
+ 3.1. Distribution of Source Form
+ .
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ .
+ 3.2. Distribution of Executable Form
+ .
+ If You distribute Covered Software in Executable Form then:
+ .
+ (a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+ .
+ (b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+ .
+ 3.3. Distribution of a Larger Work
+ .
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ .
+ 3.4. Notices
+ .
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ .
+ 3.5. Application of Additional Terms
+ .
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ .
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ .
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ .
+ 5. Termination
+ --------------
+ .
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ .
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ .
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ .
+ ************************************************************************
+ * *
+ * 6. Disclaimer of Warranty *
+ * ------------------------- *
+ * *
+ * Covered Software is provided under this License on an "as is" *
+ * basis, without warranty of any kind, either expressed, implied, or *
+ * statutory, including, without limitation, warranties that the *
+ * Covered Software is free of defects, merchantable, fit for a *
+ * particular purpose or non-infringing. The entire risk as to the *
+ * quality and performance of the Covered Software is with You. *
+ * Should any Covered Software prove defective in any respect, You *
+ * (not any Contributor) assume the cost of any necessary servicing, *
+ * repair, or correction. This disclaimer of warranty constitutes an *
+ * essential part of this License. No use of any Covered Software is *
+ * authorized under this License except under this disclaimer. *
+ * *
+ ************************************************************************
+ .
+ ************************************************************************
+ * *
+ * 7. Limitation of Liability *
+ * -------------------------- *
+ * *
+ * Under no circumstances and under no legal theory, whether tort *
+ * (including negligence), contract, or otherwise, shall any *
+ * Contributor, or anyone who distributes Covered Software as *
+ * permitted above, be liable to You for any direct, indirect, *
+ * special, incidental, or consequential damages of any character *
+ * including, without limitation, damages for lost profits, loss of *
+ * goodwill, work stoppage, computer failure or malfunction, or any *
+ * and all other commercial damages or losses, even if such party *
+ * shall have been informed of the possibility of such damages. This *
+ * limitation of liability shall not apply to liability for death or *
+ * personal injury resulting from such party's negligence to the *
+ * extent 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. Litigation
+ -------------
+ .
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ .
+ 9. Miscellaneous
+ ----------------
+ .
+ This License represents the complete agreement concerning the 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 enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ .
+ 10. Versions of the License
+ ---------------------------
+ .
+ 10.1. New Versions
+ .
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ .
+ 10.2. Effect of New Versions
+ .
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ .
+ 10.3. Modified Versions
+ .
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ .
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ .
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ .
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ .
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ .
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ .
+ You may add additional accurate notices of copyright ownership.
+ .
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ .
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
+
License: ISC
Permission to use, copy, modify, and/or distribute this software for any
diff --git a/debian/libh2-java.classpath b/debian/libh2-java.classpath
index 65d4e6c..af86cf3 100644
--- a/debian/libh2-java.classpath
+++ b/debian/libh2-java.classpath
@@ -1 +1 @@
-usr/share/java/h2.jar /usr/share/java/org.eclipse.osgi.jar /usr/share/java/lucene-core.jar /usr/share/java/slf4j-api.jar
+usr/share/java/h2.jar /usr/share/java/lucene3-core.jar /usr/share/java/slf4j-api.jar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index c4777e8..12dd8fa 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -9,7 +9,6 @@ svn export http://h2database.googlecode.com/svn/tags/$TAG/h2 $DIR
XZ_OPT=--best tar -c -v -J -f $TAR \
--exclude '*.jar' \
--exclude '*.class' \
- --exclude '*.bat' \
--exclude 'service/*' \
$DIR
rm -rf $DIR $3
diff --git a/debian/patches/use-jar-files-from-debian.patch b/debian/patches/01-use-jar-files-from-debian.patch
similarity index 59%
rename from debian/patches/use-jar-files-from-debian.patch
rename to debian/patches/01-use-jar-files-from-debian.patch
index 58dc520..d022e4a 100644
--- a/debian/patches/use-jar-files-from-debian.patch
+++ b/debian/patches/01-use-jar-files-from-debian.patch
@@ -4,22 +4,26 @@ Description: Use local jar files
Forwarded: not-needed
Author: Sebastian Reichel <sre at debian.org>
Last-Update: 2011-07-13
---- a/src/tools/org/h2/build/Build.java 2011-06-30 14:00:03.000000000 +0200
-+++ b/src/tools/org/h2/build/Build.java 2011-06-30 14:06:34.000000000 +0200
-@@ -146,12 +146,11 @@
+--- a/src/tools/org/h2/build/Build.java
++++ b/src/tools/org/h2/build/Build.java
+@@ -185,14 +185,13 @@
switchSource(debugInfo);
clean();
mkdir("temp");
- download();
String classpath = "temp" +
- File.pathSeparator + "ext/servlet-api-2.4.jar" +
-- File.pathSeparator + "ext/" + getLuceneJar() +
+- File.pathSeparator + "ext/lucene-core-3.0.2.jar" +
- File.pathSeparator + "ext/slf4j-api-1.6.0.jar" +
-- File.pathSeparator + "ext/org.osgi.core-1.2.0.jar" +
+- File.pathSeparator + "ext/org.osgi.core-4.2.0.jar" +
+- File.pathSeparator + "ext/org.osgi.enterprise-4.2.0.jar" +
+- File.pathSeparator + "ext/jts-1.13.jar" +
+ File.pathSeparator + "/usr/share/java/servlet-api-2.5.jar" +
-+ File.pathSeparator + "/usr/share/java/lucene-core.jar" +
++ File.pathSeparator + "/usr/share/java/lucene3-core.jar" +
+ File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
+ File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" +
++ File.pathSeparator + "/usr/share/java/osgi.compendium.jar" +
++ File.pathSeparator + "/usr/share/java/jts.jar" +
File.pathSeparator + System.getProperty("java.home") + "/../lib/tools.jar";
FileList files;
if (clientOnly) {
diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch
index 10ab469..44f1a3a 100644
--- a/debian/patches/02-servlet-api-compatibility.patch
+++ b/debian/patches/02-servlet-api-compatibility.patch
@@ -3,14 +3,15 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Bug: https://code.google.com/p/h2database/issues/detail?id=602
--- a/src/test/org/h2/test/unit/TestServlet.java
+++ b/src/test/org/h2/test/unit/TestServlet.java
-@@ -80,6 +80,10 @@
- throw new UnsupportedOperationException();
+@@ -86,6 +86,11 @@
}
+ @Override
+ public String getContextPath() {
+ throw new UnsupportedOperationException();
+ }
+
++ @Override
public Enumeration<Object> getInitParameterNames() {
throw new UnsupportedOperationException();
}
diff --git a/debian/patches/03-java8-compatibility.patch b/debian/patches/03-java8-compatibility.patch
deleted file mode 100644
index 208779c..0000000
--- a/debian/patches/03-java8-compatibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix a compilation issue with Java 8
-Origin: backport, https://code.google.com/p/h2database/source/detail?r=5097
---- a/src/tools/org/h2/build/BuildBase.java
-+++ b/src/tools/org/h2/build/BuildBase.java
-@@ -133,7 +133,7 @@
- throw new RuntimeException("Unsupported pattern, may only start or end with *:" + pattern);
- }
- // normalize / and \
-- pattern = replaceAll(pattern, "/", File.separator);
-+ pattern = BuildBase.replaceAll(pattern, "/", File.separator);
- FileList list = new FileList();
- for (File f : this) {
- String path = f.getPath();
diff --git a/debian/patches/03-osgi-compatibility.patch b/debian/patches/03-osgi-compatibility.patch
new file mode 100644
index 0000000..077e236
--- /dev/null
+++ b/debian/patches/03-osgi-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fix the compatibility with the version of osgi-compendium in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/org/h2/util/OsgiDataSourceFactory.java
++++ b/src/main/org/h2/util/OsgiDataSourceFactory.java
+@@ -290,7 +290,7 @@
+ */
+ static void registerService(BundleContext bundleContext,
+ org.h2.Driver driver) {
+- Properties properties = new Properties();
++ java.util.Dictionary properties = new Properties();
+ properties.put(
+ DataSourceFactory.OSGI_JDBC_DRIVER_CLASS,
+ org.h2.Driver.class.getName());
diff --git a/debian/patches/04-jts-compatibility.patch b/debian/patches/04-jts-compatibility.patch
new file mode 100644
index 0000000..85fd79c
--- /dev/null
+++ b/debian/patches/04-jts-compatibility.patch
@@ -0,0 +1,30 @@
+Description: Fix the compatibility with the version of JTS in Debian. To be removed after upgrading to JTS 0.13.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/org/h2/value/ValueGeometry.java
++++ b/src/main/org/h2/value/ValueGeometry.java
+@@ -81,7 +81,7 @@
+ private static byte[] convertToWKB(Geometry g) {
+ boolean includeSRID = g.getSRID() != 0;
+ int dimensionCount = getDimensionCount(g);
+- WKBWriter writer = new WKBWriter(dimensionCount, includeSRID);
++ WKBWriter writer = new WKBWriter(dimensionCount/*, includeSRID*/);
+ return writer.write(g);
+ }
+
+--- a/src/test/org/h2/test/db/TestSpatial.java
++++ b/src/test/org/h2/test/db/TestSpatial.java
+@@ -116,11 +116,11 @@
+ assertEquals(1, rs.getInt(1));
+ assertEquals("POLYGON ((1 1, 1 2, 2 2, 1 1))", rs.getString(2));
+ GeometryFactory f = new GeometryFactory();
+- Polygon polygon = f.createPolygon(new Coordinate[] {
++ Polygon polygon = f.createPolygon(new com.vividsolutions.jts.geom.LinearRing(new com.vividsolutions.jts.geom.impl.CoordinateArraySequence(new Coordinate[] {
+ new Coordinate(1, 1),
+ new Coordinate(1, 2),
+ new Coordinate(2, 2),
+- new Coordinate(1, 1) });
++ new Coordinate(1, 1) }), f), null);
+ assertTrue(polygon.equals(rs.getObject(2)));
+
+ rs = stat.executeQuery("select * from test where polygon = " +
diff --git a/debian/patches/series b/debian/patches/series
index 40aa88d..8a7dcc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-use-jar-files-from-debian.patch
+01-use-jar-files-from-debian.patch
02-servlet-api-compatibility.patch
-03-java8-compatibility.patch
+03-osgi-compatibility.patch
+04-jts-compatibility.patch
diff --git a/debian/rules b/debian/rules
index 87454c8..3ff3a3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,19 @@ VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
override_dh_auto_build:
mkdir -p temp bin
JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/javac" -sourcepath src/tools -d bin src/tools/org/h2/build/*.java
- JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/java" -Xmx256m -cp "bin:${JAVA_HOME}/lib/tools.jar:temp" org.h2.build.Build -Dlucene=2 jar javadoc
+ JAVA_HOME=${JAVA_HOME} "${JAVA_HOME}/bin/java" -Xmx256m -cp "bin:${JAVA_HOME}/lib/tools.jar:temp" org.h2.build.Build jar javadoc
override_dh_auto_install:
dh_auto_install
mh_installpom -plibh2-java --set-version=$(VERSION) --has-package-version src/installer/pom-template.xml
mh_installjar -plibh2-java --set-version=$(VERSION) --java-lib src/installer/pom-template.xml bin/h2-$(VERSION).jar
+override_dh_installchangelogs:
+ dh_installchangelogs src/docsrc/html/changelog.html
+
override_dh_auto_clean:
rm -rf temp bin docs/javadoc
+ find src -type f -exec sed -i 's/\/\/## Java/\/*## Java/g' {} \;
mh_clean
dh_auto_clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/h2database.git
More information about the pkg-java-commits
mailing list