[mondrian] 06/18: * d/patches/java7-compat.diff: Fix FTBFS with OpenJDK7 (new JDBC 4.1 API). (Closes: #678816). * d/control: Bump Standards-Version to 3.9.3. * d/copyright: Upgrade to lastest copyright format 1.0
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 6 13:26:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository mondrian.
commit 50c9c01766a2f9d1a42c4944b75da6e54b4969f4
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Fri Jun 29 06:42:50 2012 +0000
* d/patches/java7-compat.diff: Fix FTBFS with OpenJDK7 (new JDBC 4.1 API).
(Closes: #678816).
* d/control: Bump Standards-Version to 3.9.3.
* d/copyright: Upgrade to lastest copyright format 1.0
---
debian/ant.properties | 6 +
debian/changelog | 9 +
debian/control | 40 ++-
debian/copyright | 350 ++++++++++++++-------
debian/libmondrian-java-doc.install | 2 +-
debian/patches/01_disable_ivy.diff | 4 +-
debian/patches/02_use_debian_cup11a.diff | 16 +-
debian/patches/03_classpath.diff | 33 +-
debian/patches/04_commons_math_2.diff | 4 +-
debian/patches/05_servlet_api_25.diff | 2 +-
debian/patches/06_build_with_openjdk.diff | 32 +-
debian/patches/07_javadoc_links.diff | 8 +-
debian/patches/commons-vfs2.diff | 37 +--
debian/patches/fix_build_without_git_metadata.diff | 15 +
debian/patches/no_pentaho_kettle.diff | 13 +
debian/patches/series | 2 +
debian/rules | 2 +-
17 files changed, 373 insertions(+), 202 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..b39a02b
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,6 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
+
+skip.download=true
diff --git a/debian/changelog b/debian/changelog
index 76f84d9..ded2f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mondrian (1:3.4.1-1) unstable; urgency=low
+
+ * d/patches/java7-compat.diff: Fix FTBFS with OpenJDK7 (new JDBC 4.1 API).
+ (Closes: #678816).
+ * d/control: Bump Standards-Version to 3.9.3.
+ * d/copyright: Upgrade to lastest copyright format 1.0
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 26 Jun 2012 20:05:21 +0200
+
mondrian (4.0.0~svn13109-2) unstable; urgency=low
* d/control: Drop Depends on default-jre per Debian Java Policy as its
diff --git a/debian/control b/debian/control
index aa969a3..1911a0d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,30 @@ Source: mondrian
Section: java
Priority: optional
Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
-Build-Depends-Indep: cup (>= 0.11a+20060608), libeigenbase-resgen-java,
- liblog4j1.2-java, libcommons-vfs-java (>= 2.0), libcommons-dbcp-java,
- libcommons-math-java, libcommons-collections3-java, libcommons-logging-java,
- libolap4j-java, libxerces2-java, libservlet2.5-java, libeigenbase-farrago-java,
- libjaxp1.3-java, libxalan2-java, junit, libxmlunit-java, default-jdk-doc,
- junit-doc, libolap4j-java-doc, libeigenbase-resgen-java-doc,
- libservlet2.5-java-doc
-Standards-Version: 3.9.2
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk
+Build-Depends-Indep: cup (>= 0.11a+20060608),
+ default-jdk-doc,
+ javacc,
+ junit,
+ junit-doc,
+ libcommons-collections3-java,
+ libcommons-dbcp-java,
+ libcommons-logging-java,
+ libcommons-math-java,
+ libcommons-vfs-java (>= 2.0),
+ libeigenbase-farrago-java,
+ libeigenbase-resgen-java,
+ libeigenbase-resgen-java-doc,
+ libjaxp1.3-java,
+ liblog4j1.2-java,
+ libolap4j-java,
+ libolap4j-java-doc,
+ libservlet2.5-java,
+ libservlet2.5-java-doc,
+ libxalan2-java,
+ libxerces2-java,
+ libxmlunit-java
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mondrian
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mondrian
Homepage: http://mondrian.pentaho.org/
@@ -36,8 +51,11 @@ Package: libmondrian-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: default-jdk-doc, junit-doc, libolap4j-java-doc, libeigenbase-resgen-java-doc,
- libservlet2.5-java-doc
+Recommends: default-jdk-doc,
+ junit-doc,
+ libeigenbase-resgen-java-doc,
+ libolap4j-java-doc,
+ libservlet2.5-java-doc
Suggests: libmondrian-java
Description: OLAP server written in Java - documentation
Mondrian is an OLAP server written in Java. It enables to interactively
diff --git a/debian/copyright b/debian/copyright
index d8dd3fb..f00abe0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,115 +1,245 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Mondrian
-Maintainer: http://mondrian.pentaho.org/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mondrian
+Upstream-Contact: http://mondrian.pentaho.org/
Source: http://sourceforge.net/projects/mondrian/files/
Files: *
-Copyright: Copyright 1999-2007 CERN - European Organization for Nuclear Research
-Copyright: Copyright 1998-2005 Kana Software, Inc
-Copyright: Copyright 2001-2009 Julian Hyde
-Copyright: Copyright 2004-2005 TONBELLER AG
-Copyright: Copyright 2004-2005 Galt Johnson
-Copyright: Copyright 2003-2006 Robin Bagot
-Copyright: Copyright 2004-2005 SAS Institute, Inc
-Copyright: Copyright 2005-2006 Thomson Medstat, Inc, Ann Arbor, MI
-Copyright: Copyright 2006-2007 Cincom Systems, Inc
-Copyright: Copyright 2006-2007 JasperSoft
-Copyright: Copyright 2007-2008 Bart Pappyn
-Copyright: Copyright 2008-2009 Pentaho
-Copyright: Copyright 2006-2009 SQLstream, Inc.
-Copyright: Copyright 2008 TASecurity Group Spain
-Copyright: Copyright 2007-2008 StrateBI
-License: other
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contributio [...]
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Con [...]
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Ag [...]
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF [...]
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
+Copyright:
+ Copyright 1999-2007 CERN - European Organization for Nuclear Research
+ Copyright 1998-2005 Kana Software, Inc
+ Copyright 2001-2009 Julian Hyde
+ Copyright 2004-2005 TONBELLER AG
+ Copyright 2004-2005 Galt Johnson
+ Copyright 2003-2006 Robin Bagot
+ Copyright 2004-2005 SAS Institute, Inc
+ Copyright 2005-2006 Thomson Medstat, Inc, Ann Arbor, MI
+ Copyright 2006-2007 Cincom Systems, Inc
+ Copyright 2006-2007 JasperSoft
+ Copyright 2007-2008 Bart Pappyn
+ Copyright 2008-2009 Pentaho
+ Copyright 2006-2009 SQLstream, Inc.
+ Copyright 2008 TASecurity Group Spain
+ Copyright 2007-2008 StrateBI
+License: EPL-1.0
Files: debian/*
-Copyright: Copyright 2008-2009, Damien Raude-Morvan <drazzib at debian.org>
-License: BSD
- See `/usr/share/common-licenses/BSD'
+Copyright: Copyright 2008-2012, Damien Raude-Morvan <drazzib at debian.org>
+License: EPL-1.0
+
+License: EPL-1.0
+ Eclipse Public License - v 1.0
+ .
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
+ PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ .
+ 1. DEFINITIONS
+ .
+ "Contribution" means:
+ .
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+ .
+ i) changes to the Program, and
+ .
+ ii) additions to the Program;
+ .
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates'
+ from a Contributor if it was added to the Program by such Contributor itself
+ or anyone acting on such Contributor's behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license
+ agreement, and (ii) are not derivative works of the Program.
+ .
+ "Contributor" means any person or entity that distributes the Program.
+ .
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+ .
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+ .
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+ .
+ 2. GRANT OF RIGHTS
+ .
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any,
+ and such derivative works, in source code and object code form.
+ .
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of
+ the Contribution and the Program if, at the time the Contribution is added
+ by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license shall
+ not apply to any other combinations which include the Contribution. No
+ hardware per se is licensed hereunder.
+ .
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is required to
+ allow Recipient to distribute the Program, it is Recipient's responsibility
+ to acquire that license before distributing the Program.
+ .
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+ .
+ 3. REQUIREMENTS
+ .
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+ .
+ a) it complies with the terms and conditions of this Agreement; and
+ .
+ b) its license agreement:
+ .
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+ .
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+ .
+ iii) states that any provisions which differ from this Agreement are offered
+ by that Contributor alone and not by any other party; and
+ .
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
+ or through a medium customarily used for software exchange.
+ .
+ When the Program is made available in source code form:
+ .
+ a) it must be made available under this Agreement; and
+ .
+ b) a copy of this Agreement must be included with each copy of the Program.
+ .
+ Contributors may not remove or alter any copyright notices contained within
+ the Program.
+ .
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
+ .
+ 4. COMMERCIAL DISTRIBUTION
+ .
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore,
+ if a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such Commercial
+ Contributor in connection with its distribution of the Program in a commercial
+ product offering. The obligations in this section do not apply to any claims
+ or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor to control, and cooperate with the
+ Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such claim
+ at its own expense.
+ .
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
+ .
+ 5. NO WARRANTY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement ,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs or
+ equipment, and unavailability or interruption of operations.
+ .
+ 6. DISCLAIMER OF LIABILITY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. GENERAL
+ .
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by
+ the parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ .
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ .
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipient's obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+ .
+ Everyone is permitted to copy and distribute copies of this Agreement, but
+ in order to avoid inconsistency the Agreement is copyrighted and may only
+ be modified in the following manner. The Agreement Steward reserves the
+ right to publish new versions (including revisions) of this Agreement from
+ time to time. No one other than the Agreement Steward has the right to
+ modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to distribute
+ the Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+ rights or licenses to the intellectual property of any Contributor under
+ this Agreement, whether expressly, by implication, estoppel or otherwise.
+ All rights in the Program not expressly granted under this Agreement are
+ reserved.
+ .
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to
+ this Agreement will bring a legal action under this Agreement more than
+ one year after the cause of action arose. Each party waives its rights to
+ a jury trial in any resulting litigation.
+
diff --git a/debian/libmondrian-java-doc.install b/debian/libmondrian-java-doc.install
index 7cc0ad3..a2c3dce 100644
--- a/debian/libmondrian-java-doc.install
+++ b/debian/libmondrian-java-doc.install
@@ -1,3 +1,3 @@
-doc/api /usr/share/doc/libmondrian-java/
doc/*.html /usr/share/doc/libmondrian-java/doc/
+doc/api /usr/share/doc/libmondrian-java/
doc/images /usr/share/doc/libmondrian-java/doc/
diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff
index bfde04c..efe023a 100644
--- a/debian/patches/01_disable_ivy.diff
+++ b/debian/patches/01_disable_ivy.diff
@@ -4,11 +4,11 @@ Last-Update: 2009-12-13
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -379,7 +379,7 @@
+@@ -383,7 +383,7 @@
<antcall target="clean"/>
</target>
-- <target name="prepare" depends="download-ivy,install-ivy,resolve">
+- <target name="prepare" depends="install-ivy,resolve">
+ <target name="prepare">
<mkdir dir="${classes.dir}"/>
<mkdir dir="${testclasses.dir}"/>
diff --git a/debian/patches/02_use_debian_cup11a.diff b/debian/patches/02_use_debian_cup11a.diff
index 1e486dd..b62b9ac 100644
--- a/debian/patches/02_use_debian_cup11a.diff
+++ b/debian/patches/02_use_debian_cup11a.diff
@@ -6,7 +6,7 @@ Last-Update: 2009-12-13
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -242,7 +242,7 @@
+@@ -284,7 +284,7 @@
classpathref="project.test.classpath" property="driver.present"/>
<target name="define-tasks" depends="prepare">
@@ -15,17 +15,15 @@ Forwarded: not-needed
<classpath refid="project.classpath"/>
</taskdef>
-@@ -560,8 +560,11 @@
-
+@@ -600,8 +600,9 @@
<target name="parser" depends="define-tasks">
+ <!-- Old parser. -->
<javacup
- srcdir="${java.dir}"
- input="${java.dir}/mondrian/olap/Parser.cup"
+ srcfile="${java.dir}/mondrian/olap/Parser.cup"
-+ destdir="${java.dir}/mondrian/olap/"
-+ package="mondrian.olap"
-+ parser="Parser"
-+ symbols="ParserSym"
- expect="61"
++ destdir="${java.dir}/mondrian/olap/"
++ package="mondrian.olap" parser="Parser" symbols="ParserSym"
+ expect="63"
interface="true"/>
- </target>
+ <!-- New parser. -->
diff --git a/debian/patches/03_classpath.diff b/debian/patches/03_classpath.diff
index c8a7445..400e77f 100644
--- a/debian/patches/03_classpath.diff
+++ b/debian/patches/03_classpath.diff
@@ -2,11 +2,9 @@ Description: build.xml: use homemade classpath
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2009-12-13
Forwarded: not-needed
-Index: b/build.xml
-===================================================================
--- a/build.xml
+++ b/build.xml
-@@ -152,25 +152,22 @@
+@@ -153,33 +153,22 @@
demo/access/MondrianFoodMart.mdb"/>
<path id="project.classpath">
@@ -26,9 +24,17 @@ Index: b/build.xml
- <pathelement location="${lib.dir}/olap4j.jar"/>
- <pathelement location="${lib.dir}/xalan.jar"/>
- <pathelement location="${lib.dir}/xercesImpl.jar"/>
+- <pathelement location="${lib.dir}/validation-api.jar"/>
- <pathelement path="${env.CLASSPATH}"/>
- <pathelement location="${ant.home}/lib/ant.jar"/>
- <pathelement location="${ant.home}/lib/optional.jar"/>
+- <pathelement location="${wb.plugins.dir}/kettle-dbdialog.jar"/>
+- <pathelement location="${wb.plugins.dir}/kettle-core.jar"/>
+- <pathelement location="${wb.plugins.dir}/kettle-db.jar"/>
+- <pathelement location="${wb.plugins.dir}/kettle-engine.jar"/>
+- <pathelement location="${wb.plugins.dir}/pentaho-xul-core.jar"/>
+- <pathelement location="${wb.plugins.dir}/pentaho-xul-swing.jar"/>
+- <pathelement location="${wb.plugins.dir}/commons-io.jar"/>
+ <pathelement location="/usr/share/java/servlet-api-2.5.jar"/>
+ <pathelement location="/usr/share/java/jsp-api-2.1.jar"/>
+ <pathelement location="/usr/share/java/commons-dbcp.jar"/>
@@ -48,25 +54,36 @@ Index: b/build.xml
</path>
<path id="project.build.classpath">
-@@ -182,10 +179,11 @@
+@@ -191,12 +180,13 @@
<pathelement location="${classes.dir}"/>
<path refid="project.classpath"/>
<pathelement location="${testclasses.dir}"/>
- <fileset dir="${lib.dir}">
+ <fileset dir="/usr/share/java/">
+ <include name="olap4j-tck.jar"/>
+ <include name="olap4j-xmla.jar"/>
<include name="derby.jar"/>
<include name="xmlunit.jar"/>
<include name="junit.jar"/>
+ <include name="xml-apis.jar"/>
</fileset>
<pathelement path="${driver.classpath}"/>
- <!-- this picks up the default log4.properties -->
-@@ -197,7 +195,7 @@
+ <!-- this picks up the default log4j.properties -->
+@@ -208,7 +198,7 @@
<pathelement location="${lib.dir}/olap4j-jdk14.jar"/>
<path refid="project.classpath"/>
<pathelement location="${testclasses-jdk14.dir}"/>
- <fileset dir="${lib.dir}">
+ <fileset dir="/usr/share/java/">
+ <include name="olap4j-tck.jar"/>
+ <include name="olap4j-xmla.jar"/>
<include name="derby.jar"/>
- <include name="xmlunit.jar"/>
- <include name="junit.jar"/>
+@@ -608,7 +598,7 @@
+ <!-- New parser. -->
+ <javacc
+ target="${java.dir}/mondrian/parser/MdxParser.jj"
+- javacchome="${lib.dir}"/>
++ javacchome="/usr/share/java"/>
+ </target>
+
+ <target name="def" depends="define-tasks">
diff --git a/debian/patches/04_commons_math_2.diff b/debian/patches/04_commons_math_2.diff
index 42da75d..837b260 100644
--- a/debian/patches/04_commons_math_2.diff
+++ b/debian/patches/04_commons_math_2.diff
@@ -6,8 +6,8 @@ Last-Update: 2009-12-13
Forwarded: no
--- a/src/main/mondrian/udf/InverseNormalUdf.java
+++ b/src/main/mondrian/udf/InverseNormalUdf.java
-@@ -10,7 +10,7 @@
- package mondrian.udf;
+@@ -17,7 +17,7 @@
+ import mondrian.spi.UserDefinedFunction;
import org.apache.commons.math.MathException;
-import org.apache.commons.math.distribution.DistributionFactory;
diff --git a/debian/patches/05_servlet_api_25.diff b/debian/patches/05_servlet_api_25.diff
index 58e5af6..3526d85 100644
--- a/debian/patches/05_servlet_api_25.diff
+++ b/debian/patches/05_servlet_api_25.diff
@@ -4,7 +4,7 @@ Last-Update: 2009-12-13
Forwarded: no
--- a/src/main/mondrian/tui/MockServletContext.java
+++ b/src/main/mondrian/tui/MockServletContext.java
-@@ -66,6 +66,10 @@
+@@ -56,6 +56,10 @@
return null;
}
diff --git a/debian/patches/06_build_with_openjdk.diff b/debian/patches/06_build_with_openjdk.diff
index 1d637e1..4d97206 100644
--- a/debian/patches/06_build_with_openjdk.diff
+++ b/debian/patches/06_build_with_openjdk.diff
@@ -5,30 +5,12 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1101,7 +1101,7 @@
+@@ -543,7 +543,7 @@
+ </echo>
</target>
- <target name="binzip"
-- depends="version,checkIsNotJdk16,war,srczip,javadoc,xml_schema,retroweave,unzip-FoodMartCreateData,unzip-FoodMartAccessDB">
-+ depends="version,war,srczip,javadoc,xml_schema,retroweave,unzip-FoodMartCreateData,unzip-FoodMartAccessDB">
- <mkdir dir="${dist.dir}" />
- <delete file="${dist.bin.file}"/>
- <zip zipfile="${dist.bin.file}">
-@@ -1200,16 +1200,8 @@
- </tar>
- </target>
-
-- <target name="checkIsNotJdk16" if="jdk16.present">
-- <fail message="The 'jar' target (and dependent targets 'release', 'binzip')
--must be run under JDK 1.5." />
-- </target>
--
- <target name="compileJdk16">
-- <exec osfamily="unix" executable="${unix.script}"/>
-- <exec osfamily="windows" dir="." executable="cmd">
-- <arg line="/c .\buildJdk16.bat"/>
-- </exec>
-+ <antcall target="compile.java" />
- </target>
-
- <target name="jar" depends="version,compile,compile.tests,compileJdk16">
+- <target name="compile.java" depends="apologise" if="java.version.matches.requested">
++ <target name="compile.java">
+ <echo>Compiling on JVM Version: ${java.runtime.version}</echo>
+ <javac
+ srcdir="${java.dir}"
diff --git a/debian/patches/07_javadoc_links.diff b/debian/patches/07_javadoc_links.diff
index 3669a03..3ce85f8 100644
--- a/debian/patches/07_javadoc_links.diff
+++ b/debian/patches/07_javadoc_links.diff
@@ -6,11 +6,11 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1303,12 +1303,11 @@
+@@ -1364,12 +1364,11 @@
scope="constructors,methods"/>
<tag name="testcase" description="Test-case:"
scope="constructors,methods,types"/>
-- <link href="http://java.sun.com/javase/6/docs/api/"/>
+- <link href="http://java.sun.com/javase/7/docs/api/"/>
- <link href="http://www.olap4j.org/api/"/>
- <link href="http://junit.sourceforge.net/javadoc"/>
- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
@@ -24,11 +24,11 @@ Forwarded: not-needed
</javadoc>
<copy file="${java.dir}/mondrian/olap/Mondrian.xml"
todir="${javadoc.dir}/mondrian/olap"/>
-@@ -1350,12 +1349,11 @@
+@@ -1411,12 +1410,11 @@
scope="constructors,methods"/>
<tag name="testcase" description="Test-case:"
scope="constructors,methods,types"/>
-- <link href="http://java.sun.com/javase/6/docs/api/"/>
+- <link href="http://java.sun.com/javase/7/docs/api/"/>
- <link href="http://www.olap4j.org/api/"/>
- <link href="http://junit.sourceforge.net/javadoc"/>
- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
diff --git a/debian/patches/commons-vfs2.diff b/debian/patches/commons-vfs2.diff
index 70ae468..8d1653a 100644
--- a/debian/patches/commons-vfs2.diff
+++ b/debian/patches/commons-vfs2.diff
@@ -3,46 +3,27 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-09-11
Forwarded: no
-Index: b/src/main/mondrian/olap/Util.java
-===================================================================
--- a/src/main/mondrian/olap/Util.java
+++ b/src/main/mondrian/olap/Util.java
-@@ -13,8 +13,8 @@
-
- package mondrian.olap;
+@@ -21,8 +21,8 @@
+ import mondrian.spi.UserDefinedFunction;
+ import mondrian.util.*;
-import org.apache.commons.vfs.*;
-import org.apache.commons.vfs.provider.http.HttpFileObject;
+import org.apache.commons.vfs2.*;
+import org.apache.commons.vfs2.provider.http.HttpFileObject;
import org.apache.log4j.Logger;
- import org.eigenbase.xom.XOMUtil;
-Index: b/src/main/mondrian/rolap/RolapSchema.java
-===================================================================
+ import org.eigenbase.xom.XOMUtil;
--- a/src/main/mondrian/rolap/RolapSchema.java
+++ b/src/main/mondrian/rolap/RolapSchema.java
-@@ -55,7 +55,7 @@
- import mondrian.spi.*;
+@@ -25,7 +25,7 @@
+ import mondrian.spi.impl.Scripts;
+ import mondrian.util.ByteString;
+-import org.apache.commons.vfs.FileSystemException;
++import org.apache.commons.vfs2.FileSystemException;
import org.apache.log4j.Logger;
--import org.apache.commons.vfs.*;
-+import org.apache.commons.vfs2.*;
import org.eigenbase.xom.*;
-
-Index: b/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
-===================================================================
---- a/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
-+++ b/src/main/mondrian/spi/impl/FilterDynamicSchemaProcessor.java
-@@ -11,8 +11,8 @@
-
- import mondrian.spi.DynamicSchemaProcessor;
- import mondrian.olap.Util;
--import org.apache.commons.vfs.FileObject;
--import org.apache.commons.vfs.FileContent;
-+import org.apache.commons.vfs2.FileObject;
-+import org.apache.commons.vfs2.FileContent;
-
- import java.io.File;
- import java.io.InputStream;
diff --git a/debian/patches/fix_build_without_git_metadata.diff b/debian/patches/fix_build_without_git_metadata.diff
new file mode 100644
index 0000000..930cae0
--- /dev/null
+++ b/debian/patches/fix_build_without_git_metadata.diff
@@ -0,0 +1,15 @@
+--- a/build.xml
++++ b/build.xml
+@@ -888,11 +888,7 @@
+ </target>
+
+ <target name="version">
+- <exec executable="git" outputproperty="git.head.sha">
+- <arg value="log"/>
+- <arg value="-n1"/>
+- <arg value="--format=format:%H"/>
+- </exec>
++ <property name="git.head.sha" value="UNKNOWN"/>
+ <echo file="VERSION.txt">Title: ${name}
+ Version: ${project.revision}
+ Vendor: ${vendor}
diff --git a/debian/patches/no_pentaho_kettle.diff b/debian/patches/no_pentaho_kettle.diff
new file mode 100644
index 0000000..0d4285f
--- /dev/null
+++ b/debian/patches/no_pentaho_kettle.diff
@@ -0,0 +1,13 @@
+Description: Don't build GUI workbench because Pentaho Kettle
+ is not yet available in Debian.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+--- a/build.xml
++++ b/build.xml
+@@ -555,6 +555,7 @@
+ <exclude name="mondrian/olap4j/FactoryJdbc4Plus.java" if="jdk16.not.present"/>
+ <exclude name="mondrian/olap4j/FactoryJdbc41Impl.java" if="jdk17.not.present"/>
+ <exclude name="mondrian/util/UtilCompatibleJdk16.java" if="jdk15.present"/>
++ <exclude name="mondrian/gui/**"/>
+ </javac>
+ <copy file="src/main/mondrian/rolap/aggmatcher/DefaultRules.xml"
+ todir="${classes.dir}"/>
diff --git a/debian/patches/series b/debian/patches/series
index cd30839..d2f5168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
06_build_with_openjdk.diff
07_javadoc_links.diff
commons-vfs2.diff
+fix_build_without_git_metadata.diff
+no_pentaho_kettle.diff
diff --git a/debian/rules b/debian/rules
index 1bcd9db..fd58678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/default-java
+export JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_ARGS := -Dskip.download=true -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
DEB_ANT_BUILD_TARGET := jar javadoc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mondrian.git
More information about the pkg-java-commits
mailing list