This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mondrian.
commit 4a34282ac69803c2b3f545c47256dfdaad0b01c9 Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Nov 6 13:38:07 2015 +0100 Refreshed the patches --- debian/changelog | 10 ++- debian/patches/01_disable_ivy.diff | 4 +- debian/patches/02_use_debian_cup11a.diff | 8 +- debian/patches/03_classpath.diff | 89 ---------------------- debian/patches/04_commons_math_2.diff | 29 ------- debian/patches/06_build_with_openjdk.diff | 16 ---- debian/patches/07_javadoc_links.diff | 4 +- debian/patches/commons-vfs2.diff | 29 ------- debian/patches/fix_build_without_git_metadata.diff | 15 ---- debian/patches/no_pentaho_kettle.diff | 13 ---- debian/patches/series | 6 -- debian/rules | 31 ++++++++ 12 files changed, 48 insertions(+), 206 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5160d3..868e494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ -mondrian (1:3.4.1-2) UNRELEASED; urgency=medium +mondrian (1:3.11.0.1-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release: + - Refreshed the patches + - Replaced 03_classpath.diff with symlink in the lib directory + - Removed 04_commons_math_2.diff (fixed upstream) + - Removed 06_build_with_openjdk.diff (no longer necessary) + - Removed commons-vfs2.diff (fixed upstream) + - Removed fix_build_without_git_metadata.diff (no longer necessary) + - Removed no_pentaho_kettle.diff (no longer necessary) * debian/control: - Package co-maintained by the Java Team - Standards-Version updated to 3.9.6 (no changes) diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff index efe023a..7f7336e 100644 --- a/debian/patches/01_disable_ivy.diff +++ b/debian/patches/01_disable_ivy.diff @@ -4,7 +4,7 @@ Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -383,7 +383,7 @@ +@@ -300,7 +300,7 @@ <antcall target="clean"/> </target> @@ -12,4 +12,4 @@ Forwarded: not-needed + <target name="prepare"> <mkdir dir="${classes.dir}"/> <mkdir dir="${testclasses.dir}"/> - <mkdir dir="${build.dir}"/> + <mkdir dir="${devlib.dir}"/> diff --git a/debian/patches/02_use_debian_cup11a.diff b/debian/patches/02_use_debian_cup11a.diff index b62b9ac..d183d67 100644 --- a/debian/patches/02_use_debian_cup11a.diff +++ b/debian/patches/02_use_debian_cup11a.diff @@ -6,16 +6,16 @@ Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -284,7 +284,7 @@ - classpathref="project.test.classpath" property="driver.present"/> +@@ -178,7 +178,7 @@ + </path> <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"/> + <classpath refid="classpath"/> </taskdef> -@@ -600,8 +600,9 @@ +@@ -506,8 +506,9 @@ <target name="parser" depends="define-tasks"> <!-- Old parser. --> <javacup diff --git a/debian/patches/03_classpath.diff b/debian/patches/03_classpath.diff deleted file mode 100644 index 400e77f..0000000 --- a/debian/patches/03_classpath.diff +++ /dev/null @@ -1,89 +0,0 @@ -Description: build.xml: use homemade classpath -Author: Damien Raude-Morvan <draz...@debian.org> -Last-Update: 2009-12-13 -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -153,33 +153,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 location="${lib.dir}/validation-api.jar"/> -- <pathelement path="${env.CLASSPATH}"/> -- <pathelement location="${ant.home}/lib/ant.jar"/> -- <pathelement location="${ant.home}/lib/optional.jar"/> -- <pathelement location="${wb.plugins.dir}/kettle-dbdialog.jar"/> -- <pathelement location="${wb.plugins.dir}/kettle-core.jar"/> -- <pathelement location="${wb.plugins.dir}/kettle-db.jar"/> -- <pathelement location="${wb.plugins.dir}/kettle-engine.jar"/> -- <pathelement location="${wb.plugins.dir}/pentaho-xul-core.jar"/> -- <pathelement location="${wb.plugins.dir}/pentaho-xul-swing.jar"/> -- <pathelement location="${wb.plugins.dir}/commons-io.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"> -@@ -191,12 +180,13 @@ - <pathelement location="${classes.dir}"/> - <path refid="project.classpath"/> - <pathelement location="${testclasses.dir}"/> -- <fileset dir="${lib.dir}"> -+ <fileset dir="/usr/share/java/"> - <include name="olap4j-tck.jar"/> - <include name="olap4j-xmla.jar"/> - <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 log4j.properties --> -@@ -208,7 +198,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="olap4j-tck.jar"/> - <include name="olap4j-xmla.jar"/> - <include name="derby.jar"/> -@@ -608,7 +598,7 @@ - <!-- New parser. --> - <javacc - target="${java.dir}/mondrian/parser/MdxParser.jj" -- javacchome="${lib.dir}"/> -+ javacchome="/usr/share/java"/> - </target> - - <target name="def" depends="define-tasks"> diff --git a/debian/patches/04_commons_math_2.diff b/debian/patches/04_commons_math_2.diff deleted file mode 100644 index 837b260..0000000 --- a/debian/patches/04_commons_math_2.diff +++ /dev/null @@ -1,29 +0,0 @@ -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-13 -Forwarded: no ---- a/src/main/mondrian/udf/InverseNormalUdf.java -+++ b/src/main/mondrian/udf/InverseNormalUdf.java -@@ -17,7 +17,7 @@ - import mondrian.spi.UserDefinedFunction; - - 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/06_build_with_openjdk.diff b/debian/patches/06_build_with_openjdk.diff deleted file mode 100644 index 4d97206..0000000 --- a/debian/patches/06_build_with_openjdk.diff +++ /dev/null @@ -1,16 +0,0 @@ -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 -@@ -543,7 +543,7 @@ - </echo> - </target> - -- <target name="compile.java" depends="apologise" if="java.version.matches.requested"> -+ <target name="compile.java"> - <echo>Compiling on JVM Version: ${java.runtime.version}</echo> - <javac - srcdir="${java.dir}" diff --git a/debian/patches/07_javadoc_links.diff b/debian/patches/07_javadoc_links.diff index 3ce85f8..82b6f3c 100644 --- a/debian/patches/07_javadoc_links.diff +++ b/debian/patches/07_javadoc_links.diff @@ -6,7 +6,7 @@ Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -1364,12 +1364,11 @@ +@@ -952,12 +952,11 @@ scope="constructors,methods"/> <tag name="testcase" description="Test-case:" scope="constructors,methods,types"/> @@ -24,7 +24,7 @@ Forwarded: not-needed </javadoc> <copy file="${java.dir}/mondrian/olap/Mondrian.xml" todir="${javadoc.dir}/mondrian/olap"/> -@@ -1411,12 +1410,11 @@ +@@ -999,12 +998,11 @@ scope="constructors,methods"/> <tag name="testcase" description="Test-case:" scope="constructors,methods,types"/> diff --git a/debian/patches/commons-vfs2.diff b/debian/patches/commons-vfs2.diff deleted file mode 100644 index 8d1653a..0000000 --- a/debian/patches/commons-vfs2.diff +++ /dev/null @@ -1,29 +0,0 @@ -Description: Fix build with commons vfs 2.0 -Author: Damien Raude-Morvan <draz...@debian.org> -Last-Update: 2011-09-11 -Forwarded: no - ---- a/src/main/mondrian/olap/Util.java -+++ b/src/main/mondrian/olap/Util.java -@@ -21,8 +21,8 @@ - import mondrian.spi.UserDefinedFunction; - import mondrian.util.*; - --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; ---- a/src/main/mondrian/rolap/RolapSchema.java -+++ b/src/main/mondrian/rolap/RolapSchema.java -@@ -25,7 +25,7 @@ - import mondrian.spi.impl.Scripts; - import mondrian.util.ByteString; - --import org.apache.commons.vfs.FileSystemException; -+import org.apache.commons.vfs2.FileSystemException; - import org.apache.log4j.Logger; - - import org.eigenbase.xom.*; diff --git a/debian/patches/fix_build_without_git_metadata.diff b/debian/patches/fix_build_without_git_metadata.diff deleted file mode 100644 index 930cae0..0000000 --- a/debian/patches/fix_build_without_git_metadata.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -888,11 +888,7 @@ - </target> - - <target name="version"> -- <exec executable="git" outputproperty="git.head.sha"> -- <arg value="log"/> -- <arg value="-n1"/> -- <arg value="--format=format:%H"/> -- </exec> -+ <property name="git.head.sha" value="UNKNOWN"/> - <echo file="VERSION.txt">Title: ${name} - Version: ${project.revision} - Vendor: ${vendor} diff --git a/debian/patches/no_pentaho_kettle.diff b/debian/patches/no_pentaho_kettle.diff deleted file mode 100644 index 0d4285f..0000000 --- a/debian/patches/no_pentaho_kettle.diff +++ /dev/null @@ -1,13 +0,0 @@ -Description: Don't build GUI workbench because Pentaho Kettle - is not yet available in Debian. -Author: Damien Raude-Morvan <draz...@debian.org> ---- a/build.xml -+++ b/build.xml -@@ -555,6 +555,7 @@ - <exclude name="mondrian/olap4j/FactoryJdbc4Plus.java" if="jdk16.not.present"/> - <exclude name="mondrian/olap4j/FactoryJdbc41Impl.java" if="jdk17.not.present"/> - <exclude name="mondrian/util/UtilCompatibleJdk16.java" if="jdk15.present"/> -+ <exclude name="mondrian/gui/**"/> - </javac> - <copy file="src/main/mondrian/rolap/aggmatcher/DefaultRules.xml" - todir="${classes.dir}"/> diff --git a/debian/patches/series b/debian/patches/series index d2f5168..6ea06e0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,4 @@ 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 -fix_build_without_git_metadata.diff -no_pentaho_kettle.diff diff --git a/debian/rules b/debian/rules index fd58678..f661b26 100755 --- a/debian/rules +++ b/debian/rules @@ -10,10 +10,41 @@ DEB_ANT_BUILD_TARGET := jar javadoc #DEB_ANT_CHECK_TARGET := test DEB_ANT_CLEAN_TARGET := clean +pre-build:: + ln -s -f /usr/share/java/cup.jar lib/cup.jar + ln -s -f /usr/share/java/commons-collections3.jar lib/commons-collections3.jar + ln -s -f /usr/share/java/commons-dbcp.jar lib/commons-dbcp.jar + ln -s -f /usr/share/java/commons-io.jar lib/commons-io.jar + ln -s -f /usr/share/java/commons-logging.jar lib/commons-logging.jar + ln -s -f /usr/share/java/commons-math.jar lib/commons-math.jar + ln -s -f /usr/share/java/commons-pool.jar lib/commons-pool.jar + ln -s -f /usr/share/java/commons-vfs2.jar lib/commons-vfs2.jar + ln -s -f /usr/share/java/eigenbase-properties.jar lib/eigenbase-properties.jar + ln -s -f /usr/share/java/eigenbase-resgen.jar lib/eigenbase-resgen.jar + ln -s -f /usr/share/java/eigenbase-xom.jar lib/eigenbase-xom.jar + ln -s -f /usr/share/java/javacc.jar lib/javacc.jar + ln -s -f /usr/share/java/jaxp-1.4.jar lib/jaxp.jar + ln -s -f /usr/share/java/jsp-api-2.1.jar lib/jsp-api.jar + ln -s -f /usr/share/java/log4j-1.2.jar lib/log4j.jar + ln -s -f /usr/share/java/olap4j.jar lib/olap4j.jar + ln -s -f /usr/share/java/servlet-api-2.5.jar lib/servlet-api.jar + ln -s -f /usr/share/java/xalan2.jar lib/xalan2.jar + ln -s -f /usr/share/java/xercesImpl.jar lib/xerces.jar + 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 +clean:: + rm -f lib/*.jar + rm -f src/main/mondrian/olap4j/MondrianOlap4jDriverVersion.java + rm -f src/main/mondrian/parser/MdxParserImplConstants.java + rm -f src/main/mondrian/gui/mondrian_SW.dtd + rm -f src/main/mondrian/olap/mondrian.dtd + rm -f src/main/mondrian/rolap/aggmatcher/DefaultDef.java + rm -f src/main/mondrian/rolap/aggmatcher/aggregates.dtd + rm -f src/main/mondrian/xmla/datasourcesconfig.dtd + 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