This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mondrian.
commit 6b985e729b5b8c929cc4836ac52b68f678d6663a Author: Damien Raude-Morvan <draz...@debian.org> Date: Sun Dec 13 18:12:22 2009 +0000 package for javadoc --- debian/changelog | 4 +-- debian/control | 26 +++++++++++++++++- debian/copyright | 11 +++++--- debian/libmondrian-java-doc.doc-base.api | 10 +++++++ debian/libmondrian-java-doc.doc-base.doc | 10 +++++++ debian/libmondrian-java-doc.install | 3 +++ debian/libmondrian-java-doc.links | 1 + debian/patches/01_disable_ivy.diff | 2 +- debian/patches/02_use_debian_cup11a.diff | 2 +- debian/patches/03_classpath.diff | 4 +-- debian/patches/04_commons_math_2.diff | 2 +- debian/patches/05_servlet_api_25.diff | 4 +++ debian/patches/06_build_with_openjdk.diff | 9 +++++-- debian/patches/07_javadoc_links.diff | 44 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +-- 16 files changed, 122 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23e3be5..836a969 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <draz...@debian.org> Thu, 10 Dec 2009 01:07:31 +0100 + -- Damien Raude-Morvan <draz...@debian.org> Sun, 13 Dec 2009 18:43:18 +0100 diff --git a/debian/control b/debian/control index ade9a10..c0766ff 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,9 @@ 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 + 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 @@ Description: OLAP server written in Java * 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. diff --git a/debian/copyright b/debian/copyright index 8968a9d..d8dd3fb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,14 +6,19 @@ 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 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 diff --git a/debian/libmondrian-java-doc.doc-base.api b/debian/libmondrian-java-doc.doc-base.api new file mode 100644 index 0000000..6cab140 --- /dev/null +++ b/debian/libmondrian-java-doc.doc-base.api @@ -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/* + diff --git a/debian/libmondrian-java-doc.doc-base.doc b/debian/libmondrian-java-doc.doc-base.doc new file mode 100644 index 0000000..4641b47 --- /dev/null +++ b/debian/libmondrian-java-doc.doc-base.doc @@ -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/* + diff --git a/debian/libmondrian-java-doc.install b/debian/libmondrian-java-doc.install new file mode 100644 index 0000000..7cc0ad3 --- /dev/null +++ b/debian/libmondrian-java-doc.install @@ -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/ diff --git a/debian/libmondrian-java-doc.links b/debian/libmondrian-java-doc.links new file mode 100644 index 0000000..b13f01c --- /dev/null +++ b/debian/libmondrian-java-doc.links @@ -0,0 +1 @@ +/usr/share/doc/libmondrian-java/api /usr/share/doc/libmondrian-java/doc/api diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff index 67da141..bfde04c 100644 --- a/debian/patches/01_disable_ivy.diff +++ b/debian/patches/01_disable_ivy.diff @@ -1,6 +1,6 @@ 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 +Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml diff --git a/debian/patches/02_use_debian_cup11a.diff b/debian/patches/02_use_debian_cup11a.diff index bbe7ae3..1e486dd 100644 --- a/debian/patches/02_use_debian_cup11a.diff +++ b/debian/patches/02_use_debian_cup11a.diff @@ -2,7 +2,7 @@ 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 +Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml diff --git a/debian/patches/03_classpath.diff b/debian/patches/03_classpath.diff index c70d69d..4afad9e 100644 --- a/debian/patches/03_classpath.diff +++ b/debian/patches/03_classpath.diff @@ -1,6 +1,6 @@ -Description: build.xml use homemade classpath +Description: build.xml: use homemade classpath Author: Damien Raude-Morvan <draz...@debian.org> -Last-Update: 2009-12-06 +Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml diff --git a/debian/patches/04_commons_math_2.diff b/debian/patches/04_commons_math_2.diff index 8bfe95f..42da75d 100644 --- a/debian/patches/04_commons_math_2.diff +++ b/debian/patches/04_commons_math_2.diff @@ -2,7 +2,7 @@ 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 +Last-Update: 2009-12-13 Forwarded: no --- a/src/main/mondrian/udf/InverseNormalUdf.java +++ b/src/main/mondrian/udf/InverseNormalUdf.java diff --git a/debian/patches/05_servlet_api_25.diff b/debian/patches/05_servlet_api_25.diff index 66e974f..58e5af6 100644 --- a/debian/patches/05_servlet_api_25.diff +++ b/debian/patches/05_servlet_api_25.diff @@ -1,3 +1,7 @@ +Description: Compatibility fix with Servlet 2.5 API +Author: Damien Raude-Morvan <draz...@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 @@ diff --git a/debian/patches/06_build_with_openjdk.diff b/debian/patches/06_build_with_openjdk.diff index fe9f7a9..1d637e1 100644 --- a/debian/patches/06_build_with_openjdk.diff +++ b/debian/patches/06_build_with_openjdk.diff @@ -1,6 +1,11 @@ +Description: build.xml: Allow build with OpenJDK. +Author: Damien Raude-Morvan <draz...@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> diff --git a/debian/patches/07_javadoc_links.diff b/debian/patches/07_javadoc_links.diff new file mode 100644 index 0000000..3669a03 --- /dev/null +++ b/debian/patches/07_javadoc_links.diff @@ -0,0 +1,44 @@ +Description: Fix link of Javadoc HTML documentation + to use local API from /usr/share/doc/ +Author: Damien Raude-Morvan <draz...@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"> diff --git a/debian/patches/series b/debian/patches/series index 9b50e81..dd26059 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 04_commons_math_2.diff 05_servlet_api_25.diff 06_build_with_openjdk.diff +07_javadoc_links.diff diff --git a/debian/rules b/debian/rules index 69a6e50..9dbcbf7 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,8 @@ 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 + 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 -- 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