[pkg-java] r11284 - in trunk/mondrian/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Dec 13 18:12:24 UTC 2009
Author: drazzib
Date: 2009-12-13 18:12:22 +0000 (Sun, 13 Dec 2009)
New Revision: 11284
Added:
trunk/mondrian/debian/libmondrian-java-doc.doc-base.api
trunk/mondrian/debian/libmondrian-java-doc.doc-base.doc
trunk/mondrian/debian/libmondrian-java-doc.install
trunk/mondrian/debian/libmondrian-java-doc.links
trunk/mondrian/debian/patches/07_javadoc_links.diff
Modified:
trunk/mondrian/debian/changelog
trunk/mondrian/debian/control
trunk/mondrian/debian/copyright
trunk/mondrian/debian/patches/01_disable_ivy.diff
trunk/mondrian/debian/patches/02_use_debian_cup11a.diff
trunk/mondrian/debian/patches/03_classpath.diff
trunk/mondrian/debian/patches/04_commons_math_2.diff
trunk/mondrian/debian/patches/05_servlet_api_25.diff
trunk/mondrian/debian/patches/06_build_with_openjdk.diff
trunk/mondrian/debian/patches/series
trunk/mondrian/debian/rules
Log:
package for javadoc
Modified: trunk/mondrian/debian/changelog
===================================================================
--- trunk/mondrian/debian/changelog 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/changelog 2009-12-13 18:12:22 UTC (rev 11284)
@@ -1,5 +1,5 @@
-mondrian (4.0.0~svn13109-1) UNRELEASED; urgency=low
+mondrian (4.0.0~svn13109-1) unstable; urgency=low
* Initial release. (Closes: #560235)
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 10 Dec 2009 01:07:31 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 13 Dec 2009 18:43:18 +0100
Modified: trunk/mondrian/debian/control
===================================================================
--- trunk/mondrian/debian/control 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/control 2009-12-13 18:12:22 UTC (rev 11284)
@@ -7,7 +7,9 @@
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
+ 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.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mondrian
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mondrian
@@ -30,3 +32,25 @@
* High-speed queries through the use of aggregate tables in the RDBMS
* Advanced calculations using the calculation expressions of the MDX language
+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
+Suggests: libmondrian-java
+Description: OLAP server written in Java - documentation
+ 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
+ .
+ This package contains documentation of libmondrian-java.
Modified: trunk/mondrian/debian/copyright
===================================================================
--- trunk/mondrian/debian/copyright 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/copyright 2009-12-13 18:12:22 UTC (rev 11284)
@@ -6,14 +6,19 @@
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 2001-2009 Julian Hyde
Copyright: Copyright 2004-2005 TONBELLER AG
Copyright: Copyright 2004-2005 Galt Johnson
-Copyright: Copyright 2005 SAS Institute, Inc
+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 Bart Pappyn
+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
Added: trunk/mondrian/debian/libmondrian-java-doc.doc-base.api
===================================================================
--- trunk/mondrian/debian/libmondrian-java-doc.doc-base.api (rev 0)
+++ trunk/mondrian/debian/libmondrian-java-doc.doc-base.api 2009-12-13 18:12:22 UTC (rev 11284)
@@ -0,0 +1,10 @@
+Document: libmondrian-java-api
+Title: API Javadoc for Mondrian
+Author: Mondrian developers
+Abstract: This is the API Javadoc provided by the Mondrian library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmondrian-java/api/index.html
+Files: /usr/share/doc/libmondrian-java/api/*
+
Added: trunk/mondrian/debian/libmondrian-java-doc.doc-base.doc
===================================================================
--- trunk/mondrian/debian/libmondrian-java-doc.doc-base.doc (rev 0)
+++ trunk/mondrian/debian/libmondrian-java-doc.doc-base.doc 2009-12-13 18:12:22 UTC (rev 11284)
@@ -0,0 +1,10 @@
+Document: libmondrian-java-doc
+Title: Mondrian Documentation
+Author: Mondrian developers
+Abstract: This is the specifications provided by the Mondrian library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmondrian-java/doc/index.html
+Files: /usr/share/doc/libmondrian-java/doc/*
+
Added: trunk/mondrian/debian/libmondrian-java-doc.install
===================================================================
--- trunk/mondrian/debian/libmondrian-java-doc.install (rev 0)
+++ trunk/mondrian/debian/libmondrian-java-doc.install 2009-12-13 18:12:22 UTC (rev 11284)
@@ -0,0 +1,3 @@
+doc/api /usr/share/doc/libmondrian-java/
+doc/*.html /usr/share/doc/libmondrian-java/doc/
+doc/images /usr/share/doc/libmondrian-java/doc/
Added: trunk/mondrian/debian/libmondrian-java-doc.links
===================================================================
--- trunk/mondrian/debian/libmondrian-java-doc.links (rev 0)
+++ trunk/mondrian/debian/libmondrian-java-doc.links 2009-12-13 18:12:22 UTC (rev 11284)
@@ -0,0 +1 @@
+/usr/share/doc/libmondrian-java/api /usr/share/doc/libmondrian-java/doc/api
Modified: trunk/mondrian/debian/patches/01_disable_ivy.diff
===================================================================
--- trunk/mondrian/debian/patches/01_disable_ivy.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/01_disable_ivy.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -1,6 +1,6 @@
Description: build.xml: don't use Ivy to download JAR from internet during build.
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-06
+Last-Update: 2009-12-13
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
Modified: trunk/mondrian/debian/patches/02_use_debian_cup11a.diff
===================================================================
--- trunk/mondrian/debian/patches/02_use_debian_cup11a.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/02_use_debian_cup11a.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -2,7 +2,7 @@
- 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 <drazzib at debian.org>
-Last-Update: 2009-12-06
+Last-Update: 2009-12-13
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
Modified: trunk/mondrian/debian/patches/03_classpath.diff
===================================================================
--- trunk/mondrian/debian/patches/03_classpath.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/03_classpath.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -1,6 +1,6 @@
-Description: build.xml use homemade classpath
+Description: build.xml: use homemade classpath
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-06
+Last-Update: 2009-12-13
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
Modified: trunk/mondrian/debian/patches/04_commons_math_2.diff
===================================================================
--- trunk/mondrian/debian/patches/04_commons_math_2.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/04_commons_math_2.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -2,7 +2,7 @@
Replace DistributionFactory use by direct Impl
constructor call
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2009-12-07
+Last-Update: 2009-12-13
Forwarded: no
--- a/src/main/mondrian/udf/InverseNormalUdf.java
+++ b/src/main/mondrian/udf/InverseNormalUdf.java
Modified: trunk/mondrian/debian/patches/05_servlet_api_25.diff
===================================================================
--- trunk/mondrian/debian/patches/05_servlet_api_25.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/05_servlet_api_25.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -1,3 +1,7 @@
+Description: Compatibility fix with Servlet 2.5 API
+Author: Damien Raude-Morvan <drazzib at debian.org>
+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 @@
Modified: trunk/mondrian/debian/patches/06_build_with_openjdk.diff
===================================================================
--- trunk/mondrian/debian/patches/06_build_with_openjdk.diff 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/06_build_with_openjdk.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -1,6 +1,11 @@
+Description: build.xml: Allow build with OpenJDK.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
+
--- a/build.xml
+++ b/build.xml
-@@ -1100,7 +1100,7 @@
+@@ -1101,7 +1101,7 @@
</target>
<target name="binzip"
@@ -9,7 +14,7 @@
<mkdir dir="${dist.dir}" />
<delete file="${dist.bin.file}"/>
<zip zipfile="${dist.bin.file}">
-@@ -1199,16 +1199,8 @@
+@@ -1200,16 +1200,8 @@
</tar>
</target>
Added: trunk/mondrian/debian/patches/07_javadoc_links.diff
===================================================================
--- trunk/mondrian/debian/patches/07_javadoc_links.diff (rev 0)
+++ trunk/mondrian/debian/patches/07_javadoc_links.diff 2009-12-13 18:12:22 UTC (rev 11284)
@@ -0,0 +1,44 @@
+Description: Fix link of Javadoc HTML documentation
+ to use local API from /usr/share/doc/
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-12-13
+Forwarded: not-needed
+
+--- a/build.xml
++++ b/build.xml
+@@ -1303,12 +1303,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://www.olap4j.org/api/"/>
+- <link href="http://junit.sourceforge.net/javadoc"/>
+- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
+- <link href="http://eigenbase.sourceforge.net/resgen/api/"/>
+- <link href="http://farrago.sourceforge.net/api/"/>
++ <link href="/usr/share/doc/default-jdk-doc/api/"/>
++ <link href="/usr/share/doc/libolap4j-java/api/"/>
++ <link href="/usr/share/doc/junit-doc/doc/api/"/>
++ <link href="/usr/share/doc/libservlet2.5-java/api/"/>
++ <link href="/usr/share/doc/libeigenbase-resgen-java/api/"/>
+ </javadoc>
+ <copy file="${java.dir}/mondrian/olap/Mondrian.xml"
+ todir="${javadoc.dir}/mondrian/olap"/>
+@@ -1350,12 +1349,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://www.olap4j.org/api/"/>
+- <link href="http://junit.sourceforge.net/javadoc"/>
+- <link href="http://java.sun.com/products/servlet/2.2/javadoc/"/>
+- <link href="http://eigenbase.sourceforge.net/resgen/api/"/>
+- <link href="http://farrago.sourceforge.net/api/"/>
++ <link href="/usr/share/doc/default-jdk-doc/api/"/>
++ <link href="/usr/share/doc/libolap4j-java/api/"/>
++ <link href="/usr/share/doc/junit-doc/doc/api/"/>
++ <link href="/usr/share/doc/libservlet2.5-java/api/"/>
++ <link href="/usr/share/doc/libeigenbase-resgen-java/api/"/>
+ <doclet
+ name="ydoc.doclets.YStandard"
+ path="${ydoc.home}/lib/ydoc.jar${ps}${ydoc.home}/lib/class2svg.jar${ps}${ydoc.home}/resources${ps}${ydoc.home}/doc">
Modified: trunk/mondrian/debian/patches/series
===================================================================
--- trunk/mondrian/debian/patches/series 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/patches/series 2009-12-13 18:12:22 UTC (rev 11284)
@@ -4,3 +4,4 @@
04_commons_math_2.diff
05_servlet_api_25.diff
06_build_with_openjdk.diff
+07_javadoc_links.diff
Modified: trunk/mondrian/debian/rules
===================================================================
--- trunk/mondrian/debian/rules 2009-12-13 17:01:17 UTC (rev 11283)
+++ trunk/mondrian/debian/rules 2009-12-13 18:12:22 UTC (rev 11284)
@@ -13,8 +13,8 @@
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
+ dh_install -plibmondrian-java lib/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_link -plibmondrian-java usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar
get-orig-source:
uscan --force-download
More information about the pkg-java-commits
mailing list