Author: drazzib Date: 2011-09-11 00:20:01 +0000 (Sun, 11 Sep 2011) New Revision: 14812
Added: tags/mondrian/4.0.0~svn13109-2/ tags/mondrian/4.0.0~svn13109-2/debian/changelog tags/mondrian/4.0.0~svn13109-2/debian/control tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff tags/mondrian/4.0.0~svn13109-2/debian/patches/commons-vfs2.diff tags/mondrian/4.0.0~svn13109-2/debian/patches/series tags/mondrian/4.0.0~svn13109-2/debian/rules tags/mondrian/4.0.0~svn13109-2/debian/source/ Removed: tags/mondrian/4.0.0~svn13109-2/debian/changelog tags/mondrian/4.0.0~svn13109-2/debian/control tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff tags/mondrian/4.0.0~svn13109-2/debian/patches/series tags/mondrian/4.0.0~svn13109-2/debian/rules Log: [svn-buildpackage] Tagging mondrian 4.0.0~svn13109-2 Deleted: tags/mondrian/4.0.0~svn13109-2/debian/changelog =================================================================== --- trunk/mondrian/debian/changelog 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/mondrian/4.0.0~svn13109-2/debian/changelog 2011-09-11 00:20:01 UTC (rev 14812) @@ -1,5 +0,0 @@ -mondrian (4.0.0~svn13109-1) unstable; urgency=low - - * Initial release. (Closes: #560235) - - -- Damien Raude-Morvan <[email protected]> Sun, 13 Dec 2009 18:43:18 +0100 Copied: tags/mondrian/4.0.0~svn13109-2/debian/changelog (from rev 14807, trunk/mondrian/debian/changelog) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/changelog (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/changelog 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,15 @@ +mondrian (4.0.0~svn13109-2) unstable; urgency=low + + * d/control: Drop Depends on default-jre per Debian Java Policy as its + a library package. + * Fix for commons-vfs2. + * Switch to 3.0 (quilt) format. + * Bump to Standards-Version to 3.9.2. + + -- Damien Raude-Morvan <[email protected]> Sun, 11 Sep 2011 01:55:25 +0200 + +mondrian (4.0.0~svn13109-1) unstable; urgency=low + + * Initial release. (Closes: #560235) + + -- Damien Raude-Morvan <[email protected]> Sun, 13 Dec 2009 18:43:18 +0100 Deleted: tags/mondrian/4.0.0~svn13109-2/debian/control =================================================================== --- trunk/mondrian/debian/control 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/mondrian/4.0.0~svn13109-2/debian/control 2011-09-11 00:20:01 UTC (rev 14812) @@ -1,56 +0,0 @@ -Source: mondrian -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), 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, 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 -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 - -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. Copied: tags/mondrian/4.0.0~svn13109-2/debian/control (from rev 14807, trunk/mondrian/debian/control) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/control (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/control 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,56 @@ +Source: mondrian +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), 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 +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/ + +Package: libmondrian-java +Architecture: all +Depends: ${misc:Depends} +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 + +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. Deleted: tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff =================================================================== --- trunk/mondrian/debian/patches/03_classpath.diff 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff 2011-09-11 00:20:01 UTC (rev 14812) @@ -1,70 +0,0 @@ -Description: build.xml: use homemade classpath -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-13 -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"/> Copied: tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff (from rev 14807, trunk/mondrian/debian/patches/03_classpath.diff) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/patches/03_classpath.diff 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,72 @@ +Description: build.xml: use homemade classpath +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-12-13 +Forwarded: not-needed +Index: b/build.xml +=================================================================== +--- 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-vfs2.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"/> Copied: tags/mondrian/4.0.0~svn13109-2/debian/patches/commons-vfs2.diff (from rev 14807, trunk/mondrian/debian/patches/commons-vfs2.diff) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/patches/commons-vfs2.diff (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/patches/commons-vfs2.diff 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,48 @@ +Description: Fix build with commons vfs 2.0 +Author: Damien Raude-Morvan <[email protected]> +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; + +-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 +=================================================================== +--- a/src/main/mondrian/rolap/RolapSchema.java ++++ b/src/main/mondrian/rolap/RolapSchema.java +@@ -55,7 +55,7 @@ + import mondrian.spi.*; + + 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; Deleted: tags/mondrian/4.0.0~svn13109-2/debian/patches/series =================================================================== --- trunk/mondrian/debian/patches/series 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/mondrian/4.0.0~svn13109-2/debian/patches/series 2011-09-11 00:20:01 UTC (rev 14812) @@ -1,7 +0,0 @@ -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 -07_javadoc_links.diff Copied: tags/mondrian/4.0.0~svn13109-2/debian/patches/series (from rev 14807, trunk/mondrian/debian/patches/series) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/patches/series (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/patches/series 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,8 @@ +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 +07_javadoc_links.diff +commons-vfs2.diff Deleted: tags/mondrian/4.0.0~svn13109-2/debian/rules =================================================================== --- trunk/mondrian/debian/rules 2011-09-09 22:28:03 UTC (rev 14793) +++ tags/mondrian/4.0.0~svn13109-2/debian/rules 2011-09-11 00:20:01 UTC (rev 14812) @@ -1,20 +0,0 @@ -#!/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 -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 Copied: tags/mondrian/4.0.0~svn13109-2/debian/rules (from rev 14807, trunk/mondrian/debian/rules) =================================================================== --- tags/mondrian/4.0.0~svn13109-2/debian/rules (rev 0) +++ tags/mondrian/4.0.0~svn13109-2/debian/rules 2011-09-11 00:20:01 UTC (rev 14812) @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.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 -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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
