This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository olap4j.
commit 5b0daa8ee4bd29d6881a01fc93f31dc41fc09de4 Author: Damien Raude-Morvan <[email protected]> Date: Fri Dec 11 17:56:43 2009 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/README.source | 9 +++ debian/changelog | 5 ++ debian/compat | 1 + debian/control | 45 ++++++++++++ debian/copyright | 102 ++++++++++++++++++++++++++ debian/libolap4j-java-doc.doc-base | 9 +++ debian/libolap4j-java-doc.install | 1 + debian/orig-tar.exclude | 1 + debian/orig-tar.sh | 12 +++ debian/patches/01_disable_ivy.diff | 29 ++++++++ debian/patches/02_build_with_openjdk.diff | 44 +++++++++++ debian/patches/03_use_debian_cup11a.diff | 33 +++++++++ debian/patches/04_disable_hsql_test_data.diff | 19 +++++ debian/patches/series | 4 + debian/rules | 23 ++++++ debian/watch | 2 + 16 files changed, 339 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..f846ea2 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..812ab59 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +olap4j (0.9.8~svn293-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #560236) + + -- Damien Raude-Morvan <[email protected]> Thu, 10 Dec 2009 00:42:45 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9c363ae --- /dev/null +++ b/debian/control @@ -0,0 +1,45 @@ +Source: olap4j +Section: java +Priority: optional +Maintainer: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt +Build-Depends-Indep: cup (>= 0.11a+20060608), liblog4j1.2-java, + libcommons-dbcp-java, libxerces2-java, junit, ant-optional, + ant-contrib +Standards-Version: 3.8.3 +Vcs-Svn: http://svn.drazzib.com/debian-pkg/olap4j/trunk +Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/olap4j/trunk +Homepage: http://www.olap4j.org/ + +Package: libolap4j-java +Architecture: all +Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, + liblog4j1.2-java, libcommons-dbcp-java, libxerces2-java +Description: unified Java API to access an OLAP server + olap4j is a Java library to access a OLAP server with an unified API : + you may switch your OLAP server to another implementation with ease. + . + It can be compared to JDBC for SQL servers. + . + This project is supported by many libre software project in this area : + * Jasperreports + * Mondrian + * Pentaho + +Package: libolap4j-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libolap4j-java +Description: unified Java API to access an OLAP server - documentation + olap4j is a Java library to access a OLAP server with an unified API : + you may switch your OLAP server to another implementation with ease. + . + It can be compared to JDBC for SQL servers. + . + This project is supported by many libre software project in this area : + * Jasperreports + * Mondrian + * Pentaho + . + This package contains Javadoc API of olap4j package. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..61c0e5a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,102 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: OLAP4J +Maintainer: Julian Hyde <[email protected]> +Source: http://www.olap4j.org/ + +Files: * +Copyright: Copyright (C) 1999-2002 Kana Software, Inc. +Copyright: Copyright (C) 2002-2008 Julian Hyde and others +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. + + +Files: debian/* +Copyright: Copyright 2008-2009, Damien Raude-Morvan <[email protected]> +License: BSD + See `/usr/share/common-licenses/BSD' diff --git a/debian/libolap4j-java-doc.doc-base b/debian/libolap4j-java-doc.doc-base new file mode 100644 index 0000000..cd0677e --- /dev/null +++ b/debian/libolap4j-java-doc.doc-base @@ -0,0 +1,9 @@ +Document: libolap4j-java-doc +Title: API Javadoc for olap4j +Author: olap4j developers +Abstract: This is the API Javadoc provided by the olap4j library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libolap4j-java/api/index.html +Files: /usr/share/doc/libolap4j-java/api/* diff --git a/debian/libolap4j-java-doc.install b/debian/libolap4j-java-doc.install new file mode 100644 index 0000000..41a555b --- /dev/null +++ b/debian/libolap4j-java-doc.install @@ -0,0 +1 @@ +bin/javadoc/* /usr/share/doc/libolap4j-java/api/ diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..e1801bb --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1 @@ +foodmart/* diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100644 index 0000000..2d50a85 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# Extract and repack upstream source (zip in upstream zip package) +# $2 = version +# $3 = file +DIR=olap4j-$2 +TAR=../olap4j_$2.orig.tar.gz +REVISION=`echo $2 | sed s/.*\~svn//` + +svn export -r $REVISION https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk $DIR +GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff new file mode 100644 index 0000000..c1968c6 --- /dev/null +++ b/debian/patches/01_disable_ivy.diff @@ -0,0 +1,29 @@ +--- a/build.xml ++++ b/build.xml +@@ -149,7 +149,7 @@ + // End XmlaOlap4jDriverVersion.java</echo> + </target> + +- <target name="parser" depends="resolve"> ++ <target name="parser"> + <taskdef name="javacup" classname="java_cup.JavaCUPTask"> + <classpath refid="classpath" /> + </taskdef> +--- a/subfloor.xml ++++ b/subfloor.xml +@@ -364,12 +364,11 @@ + + (Fetches and) installs ant-contrib tasks. + ====================================================================--> +- <target name="install-antcontrib" +- depends="antcontrib.download-check"> ++ <target name="install-antcontrib"> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> +- <fileset dir="${antcontrib.build.cache.dir}"> +- <include name="*.jar" /> ++ <fileset dir="/usr/share/java/"> ++ <include name="ant-contrib.jar" /> + </fileset> + </classpath> + </taskdef> diff --git a/debian/patches/02_build_with_openjdk.diff b/debian/patches/02_build_with_openjdk.diff new file mode 100644 index 0000000..f7f097b --- /dev/null +++ b/debian/patches/02_build_with_openjdk.diff @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_build_with_openjdk.dpatch by Damien Raude-Morvan <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: build.xml: Allow build with OpenJDK. + +@DPATCH@ +--- a/build.xml ++++ b/build.xml +@@ -23,11 +23,6 @@ + ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.java, + ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" /> + +- <target name="checkIsNotJdk16" if="jdk16.present"> +- <fail message="The 'jar' target (and dependent targets 'release', 'binzip') must be run under JDK 1.5." /> +- </target> +- +- + <condition property="jdk16.present"> + <equals arg1="${ant.java.version}" arg2="1.6" /> + </condition> +@@ -85,7 +80,7 @@ + </tar> + </target> + +- <target name="jar" depends="checkIsNotJdk16,compile,compile-tests,compileJdk16,set-build.id,generate.manifest" ++ <target name="jar" depends="compile,compile-tests,compileJdk16,set-build.id,generate.manifest" + description="Jars up the bin directory after a compile"> + <zip destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar"> + <zipfileset dir="${classes.dir}" prefix="" includes="**/*" /> +@@ -98,12 +93,7 @@ + </target> + + <target name="compileJdk16"> +- <exec osfamily="unix" executable="${basedir}/buildJdk16.sh"> +- <arg line="compile"/> +- </exec> +- <exec osfamily="windows" executable="${basedir}/buildJdk16.bat"> +- <arg line="compile"/> +- </exec> ++ <antcall target="compile.compile"/> + </target> + + <target name="source.zip"> diff --git a/debian/patches/03_use_debian_cup11a.diff b/debian/patches/03_use_debian_cup11a.diff new file mode 100644 index 0000000..6704a09 --- /dev/null +++ b/debian/patches/03_use_debian_cup11a.diff @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_use_debian_cup11a.dpatch by Damien Raude-Morvan <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: build.xml: +## DP: - CUP ant task had changed from java_cup.JavaCUPTask to java_cup.anttask.CUPTask +## DP: - CUP ant task need more parameters: destdir, package and srcdir + + +@DPATCH@ +--- a/build.xml ++++ b/build.xml +@@ -140,12 +140,16 @@ + </target> + + <target name="parser"> +- <taskdef name="javacup" classname="java_cup.JavaCUPTask"> ++ <taskdef name="javacup" classname="java_cup.anttask.CUPTask"> + <classpath refid="classpath" /> + </taskdef> +- <javacup srcdir="${src.dir}" +- input="${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup" +- expect="61" interface="true" /> ++ <javacup ++ srcfile="${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup" ++ destdir="${src.dir}/org/olap4j/mdx/parser/impl/" ++ package="org.olap4j.mdx.parser.impl" ++ parser="DefaultMdxParser" ++ symbols="DefaultMdxParserSym" ++ expect="61" interface="true" /> + </target> + + <target name="clean-tests" depends="subfloor.clean-tests"> diff --git a/debian/patches/04_disable_hsql_test_data.diff b/debian/patches/04_disable_hsql_test_data.diff new file mode 100644 index 0000000..7ebb5e3 --- /dev/null +++ b/debian/patches/04_disable_hsql_test_data.diff @@ -0,0 +1,19 @@ +--- a/build.xml ++++ b/build.xml +@@ -153,7 +153,6 @@ + </target> + + <target name="clean-tests" depends="subfloor.clean-tests"> +- <antcall target="init-hsql"/> + </target> + + <target name="clean-hsql"> +@@ -168,8 +167,6 @@ + </target> + + <target name="init-hsql" depends="clean-hsql"> +- <unzip src="${basedir}/foodmart/foodmart.zip" dest="${basedir}/foodmart/" +- overwrite="false" /> + </target> + + <target name="init-tests" depends="clean-tests"> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..043466e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01_disable_ivy.diff +02_build_with_openjdk.diff +03_use_debian_cup11a.diff +04_disable_hsql_test_data.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d9a4be9 --- /dev/null +++ b/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java + +DEB_JARS := cup log4j-1.2 xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib + +DEB_ANT_BUILD_TARGET := version-properties jar javadoc +# olap4j need mondrian for testing. +# => disable to remove some cycle in Build-Depends +#DEB_ANT_CHECK_TARGET := test +DEB_ANT_CLEAN_TARGET := clean + +install/libolap4j-java:: + dh_install dist/$(DEB_SOURCE_PACKAGE)-0.9.8-SNAPSHOT.jar usr/share/java + dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-0.9.8-SNAPSHOT.jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar + +get-orig-source: + debian/orig-tar.sh --upstream-version $(DEB_UPSTREAM_VERSION) + #uscan --force-download diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..440d2f1 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/olap4j/olap4j-([\d\.]+).zip debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/olap4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
