This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository mondrian.

commit e2ed92d8311855b6756fec3462a1e39fa7e3de4e
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Fri Dec 11 17:57:29 2009 +0000

    [svn-inject] Applying Debian modifications to trunk
---
 debian/README.source                      |   9 +++
 debian/changelog                          |   5 ++
 debian/compat                             |   1 +
 debian/control                            |  32 +++++++++
 debian/copyright                          | 110 ++++++++++++++++++++++++++++++
 debian/orig-tar.sh                        |  17 +++++
 debian/patches/01_disable_ivy.diff        |  15 ++++
 debian/patches/02_use_debian_cup11a.diff  |  31 +++++++++
 debian/patches/03_classpath.diff          |  70 +++++++++++++++++++
 debian/patches/04_commons_math_2.diff     |  29 ++++++++
 debian/patches/05_servlet_api_25.diff     |  13 ++++
 debian/patches/06_build_with_openjdk.diff |  29 ++++++++
 debian/patches/series                     |   6 ++
 debian/rules                              |  20 ++++++
 debian/watch                              |   3 +
 15 files changed, 390 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..23e3be5
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mondrian (4.0.0~svn13109-1) UNRELEASED; urgency=low
+
+  * Initial release. (Closes: #560235)
+
+ -- Damien Raude-Morvan <draz...@debian.org>  Thu, 10 Dec 2009 01:07:31 +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..4cd9591
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: mondrian
+Section: java
+Priority: optional
+Maintainer: Damien Raude-Morvan <draz...@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, 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
+Standards-Version: 3.8.3
+Vcs-Svn: http://svn.drazzib.com/debian-pkg/mondrian/trunk
+Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/mondrian/trunk
+Homepage: http://mondrian.pentaho.org/
+
+Package: libmondrian-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless
+Description: OLAP server written in Java
+ Mondrian is an OLAP server written in Java. It enables to interactively
+ analyze very large datasets stored in SQL databases without writing SQL.
+ .
+ It can be used for :
+  * High performance, interactive analysis of large or small volumes of
+    information
+  * "Dimensional" exploration of data, for example analyzing sales by product
+    line, by region, by time period
+  * Parsing of Multi-Dimensional eXpression (MDX) language into Structured 
Query
+    Language (SQL) to retrieve answers to dimensional queries
+  * High-speed queries through the use of aggregate tables in the RDBMS
+  * Advanced calculations using the calculation expressions of the MDX language
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..8968a9d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,110 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Mondrian
+Maintainer: 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-2008 Julian Hyde
+Copyright: Copyright 2004-2005 TONBELLER AG
+Copyright: Copyright 2004-2005 Galt Johnson
+Copyright: Copyright 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 Bart Pappyn
+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 <draz...@debian.org>
+License: BSD
+  See `/usr/share/common-licenses/BSD'
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100644
index 0000000..96fedf2
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=mondrian-$2
+TAR=mondrian_$2.orig.tar.gz
+
+# Repack upstream source to tar.gz
+mkdir $DIR
+(
+cd $DIR
+unzip -j $3 mondrian-*/mondrian-*-src.zip
+unzip -d . mondrian-*-src.zip
+mv mondrian-*/* .
+rm mondrian-*-src.zip
+)
+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..67da141
--- /dev/null
+++ b/debian/patches/01_disable_ivy.diff
@@ -0,0 +1,15 @@
+Description: build.xml: don't use Ivy to download JAR from internet during 
build.
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2009-12-06
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -379,7 +379,7 @@
+     <antcall target="clean"/>
+   </target>
+ 
+-  <target name="prepare" depends="download-ivy,install-ivy,resolve">
++  <target name="prepare">
+     <mkdir dir="${classes.dir}"/>
+     <mkdir dir="${testclasses.dir}"/>
+     <mkdir dir="${build.dir}"/>
diff --git a/debian/patches/02_use_debian_cup11a.diff 
b/debian/patches/02_use_debian_cup11a.diff
new file mode 100644
index 0000000..bbe7ae3
--- /dev/null
+++ b/debian/patches/02_use_debian_cup11a.diff
@@ -0,0 +1,31 @@
+Description: build.xml:
+ - CUP ant task had changed from java_cup.JavaCUPTask to 
java_cup.anttask.CUPTask
+ - CUP ant task need more parameters: destdir, package and srcdir
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2009-12-06
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -242,7 +242,7 @@
+            classpathref="project.test.classpath" property="driver.present"/>
+ 
+   <target name="define-tasks" depends="prepare">
+-    <taskdef name="javacup" classname="java_cup.JavaCUPTask">
++    <taskdef name="javacup" classname="java_cup.anttask.CUPTask">
+       <classpath refid="project.classpath"/>
+     </taskdef>
+ 
+@@ -560,8 +560,11 @@
+ 
+   <target name="parser" depends="define-tasks">
+     <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"
+         interface="true"/>
+   </target>
diff --git a/debian/patches/03_classpath.diff b/debian/patches/03_classpath.diff
new file mode 100644
index 0000000..c70d69d
--- /dev/null
+++ b/debian/patches/03_classpath.diff
@@ -0,0 +1,70 @@
+Description: build.xml use homemade classpath
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2009-12-06
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -152,25 +152,22 @@
+ demo/access/MondrianFoodMart.mdb"/>
+ 
+   <path id="project.classpath">
+-    <pathelement location="${lib.dir}/servlet-api.jar"/>
+-    <pathelement location="${lib.dir}/jsp-api.jar"/>
+-    <pathelement location="${lib.dir}/commons-dbcp.jar"/>
+-    <pathelement location="${lib.dir}/commons-collections.jar"/>
+-    <pathelement location="${lib.dir}/commons-logging.jar"/>
+-    <pathelement location="${lib.dir}/commons-math.jar"/>
+-    <pathelement location="${lib.dir}/commons-pool.jar"/>
+-    <pathelement location="${lib.dir}/commons-vfs.jar"/>
+-    <pathelement location="${lib.dir}/eigenbase-properties.jar"/>
+-    <pathelement location="${lib.dir}/eigenbase-resgen.jar"/>
+-    <pathelement location="${lib.dir}/eigenbase-xom.jar"/>
+-    <pathelement location="${lib.dir}/javacup.jar"/>
+-    <pathelement location="${lib.dir}/log4j.jar"/>
+-    <pathelement location="${lib.dir}/olap4j.jar"/>
+-    <pathelement location="${lib.dir}/xalan.jar"/>
+-    <pathelement location="${lib.dir}/xercesImpl.jar"/>
+-    <pathelement path="${env.CLASSPATH}"/>
+-    <pathelement location="${ant.home}/lib/ant.jar"/>
+-    <pathelement location="${ant.home}/lib/optional.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"/>
++    <pathelement location="/usr/share/java/commons-collections3.jar"/>
++    <pathelement location="/usr/share/java/commons-logging.jar"/>
++    <pathelement location="/usr/share/java/commons-math.jar"/>
++    <pathelement location="/usr/share/java/commons-pool.jar"/>
++    <pathelement location="/usr/share/java/commons-vfs.jar"/>
++    <pathelement location="/usr/share/java/eigenbase-properties.jar"/>
++    <pathelement location="/usr/share/java/eigenbase-resgen.jar"/>
++    <pathelement location="/usr/share/java/eigenbase-xom.jar"/>
++    <pathelement location="/usr/share/java/cup.jar"/>
++    <pathelement location="/usr/share/java/log4j-1.2.jar"/>
++    <pathelement location="/usr/share/java/olap4j.jar"/>
++    <pathelement location="/usr/share/java/xalan2.jar"/>
++    <pathelement location="/usr/share/java/xercesImpl.jar"/>
+   </path>
+ 
+   <path id="project.build.classpath">
+@@ -182,10 +179,11 @@
+     <pathelement location="${classes.dir}"/>
+     <path refid="project.classpath"/>
+     <pathelement location="${testclasses.dir}"/>
+-    <fileset dir="${lib.dir}">
++    <fileset dir="/usr/share/java/">
+       <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 @@
+     <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="derby.jar"/>
+       <include name="xmlunit.jar"/>
+       <include name="junit.jar"/>
diff --git a/debian/patches/04_commons_math_2.diff 
b/debian/patches/04_commons_math_2.diff
new file mode 100644
index 0000000..8bfe95f
--- /dev/null
+++ b/debian/patches/04_commons_math_2.diff
@@ -0,0 +1,29 @@
+Description: Commons Math 2.x compatibility fix.
+ Replace DistributionFactory use by direct Impl
+ constructor call
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2009-12-07
+Forwarded: no
+--- a/src/main/mondrian/udf/InverseNormalUdf.java
++++ b/src/main/mondrian/udf/InverseNormalUdf.java
+@@ -10,7 +10,7 @@
+ package mondrian.udf;
+ 
+ import org.apache.commons.math.MathException;
+-import org.apache.commons.math.distribution.DistributionFactory;
++import org.apache.commons.math.distribution.NormalDistributionImpl;
+ import org.apache.commons.math.distribution.NormalDistribution;
+ import org.apache.log4j.Logger;
+ 
+@@ -45,10 +45,7 @@
+     private static final Logger LOGGER =
+         Logger.getLogger(InverseNormalUdf.class);
+ 
+-    private static DistributionFactory distributionFactory =
+-        DistributionFactory.newInstance();
+-    private static NormalDistribution nd =
+-        distributionFactory.createNormalDistribution();
++    private static NormalDistribution nd = new NormalDistributionImpl();
+ 
+     public String getName() {
+         return "InverseNormal";
diff --git a/debian/patches/05_servlet_api_25.diff 
b/debian/patches/05_servlet_api_25.diff
new file mode 100644
index 0000000..66e974f
--- /dev/null
+++ b/debian/patches/05_servlet_api_25.diff
@@ -0,0 +1,13 @@
+--- a/src/main/mondrian/tui/MockServletContext.java
++++ b/src/main/mondrian/tui/MockServletContext.java
+@@ -66,6 +66,10 @@
+         return null;
+     }
+ 
++    public String getContextPath() {
++        return null;
++    }
++
+     /**
+      * Returns the major version of the Java Servlet API that this servlet
+      * container supports.
diff --git a/debian/patches/06_build_with_openjdk.diff 
b/debian/patches/06_build_with_openjdk.diff
new file mode 100644
index 0000000..fe9f7a9
--- /dev/null
+++ b/debian/patches/06_build_with_openjdk.diff
@@ -0,0 +1,29 @@
+--- a/build.xml
++++ b/build.xml
+@@ -1100,7 +1100,7 @@
+   </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}">
+@@ -1199,16 +1199,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">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9b50e81
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+01_disable_ivy.diff
+02_use_debian_cup11a.diff
+03_classpath.diff
+04_commons_math_2.diff
+05_servlet_api_25.diff
+06_build_with_openjdk.diff
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..69a6e50
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/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_ANT_ARGS         := -Dskip.download=true -Dant.build.javac.source=1.5 
-Dant.build.javac.target=1.5
+
+DEB_ANT_BUILD_TARGET := jar javadoc
+#DEB_ANT_CHECK_TARGET := test
+DEB_ANT_CLEAN_TARGET := clean
+
+install/libmondrian-java::
+       mv lib/$(DEB_SOURCE_PACKAGE).jar 
lib/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
+       dh_install lib/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
usr/share/java
+       dh_link 
usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
usr/share/java/$(DEB_SOURCE_PACKAGE).jar
+
+get-orig-source:
+       uscan --force-download
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3353a87
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/mondrian/mondrian-([\d\.]+).zip debian debian/orig-tar.sh
+

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/mondrian.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to