This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository olap4j.
commit 2deb7ca3c816cadf5dbffcdf93529c8bed5dc69f Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 20 18:10:06 2015 +0200 Refreshed the patches Replaced the build dependency on cup with javacc --- debian/ant.properties | 3 ++ debian/changelog | 5 +- debian/control | 4 +- debian/patches/01_disable_ivy.diff | 51 +++++++++--------- debian/patches/02_build_with_openjdk.diff | 55 ++++++++++--------- debian/patches/03_use_debian_cup11a.diff | 29 ---------- debian/patches/04_disable_hsql_test_data.diff | 26 --------- .../patches/06_compatible_with_java7_encoding.diff | 12 ----- debian/patches/07_test_classpath.diff | 17 ++++++ debian/patches/08_source_encoding.diff | 13 +++++ debian/patches/javadoc_links.diff | 63 +++++++++++----------- debian/patches/series | 5 +- debian/rules | 2 +- 13 files changed, 127 insertions(+), 158 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..8cc0da3 --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,3 @@ +lib.dir=/usr/share/java +ant.build.javac.source=1.6 +ant.build.javac.target=1.6 diff --git a/debian/changelog b/debian/changelog index f361506..4ba07b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -olap4j (1.0.1.500-3) UNRELEASED; urgency=medium +olap4j (1.2.0-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release: + - Refreshed the patches + - Replaced the build dependency on cup with javacc * debian/control: - Standards-Version updated to 3.9.6 (no changes) * Use XZ compression for the upstream tarball diff --git a/debian/control b/debian/control index 3c6329a..519cf58 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,14 @@ Uploaders: Damien Raude-Morvan <[email protected]> Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk Build-Depends-Indep: ant-contrib, ant-optional, - cup (>= 0.11a+20060608), default-jdk-doc, + javacc, junit, junit-doc, libcommons-dbcp-java, + libeigenbase-farrago-java, liblog4j1.2-java, + libmondrian-java, libxerces2-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/olap4j.git diff --git a/debian/patches/01_disable_ivy.diff b/debian/patches/01_disable_ivy.diff index 522328b..ff9fa27 100644 --- a/debian/patches/01_disable_ivy.diff +++ b/debian/patches/01_disable_ivy.diff @@ -1,33 +1,32 @@ Description: Disable ivy (i.e. don't download stuff from net during build) Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -254,7 +254,7 @@ - // End XmlaOlap4jDriverVersion.java</echo> - </target> - -- <target name="parser" depends="resolve"> -+ <target name="parser"> - <taskdef name="javacup" classname="java_cup.JavaCUPTask"> - <classpath refid="classpath" /> - </taskdef> +@@ -318,7 +318,7 @@ + + <target name="define-tasks"/> + +- <target name="parser" depends="resolve,define-tasks"> ++ <target name="parser" depends="define-tasks"> + <javacc + target="${src.dir}/org/olap4j/mdx/parser/impl/MdxParser.jj" + javacchome="${lib.dir}"/> --- a/subfloor.xml +++ b/subfloor.xml -@@ -365,12 +365,11 @@ - - (Fetches and) installs ant-contrib tasks. - ====================================================================--> -- <target name="install-antcontrib" -- depends="antcontrib.download-check"> -+ <target name="install-antcontrib"> - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> -- <fileset dir="${antcontrib.build.cache.dir}"> -- <include name="*.jar" /> -+ <fileset dir="/usr/share/java/"> -+ <include name="ant-contrib.jar" /> - </fileset> - </classpath> - </taskdef> +@@ -362,12 +362,11 @@ + + (Fetches and) installs ant-contrib tasks. + ====================================================================--> +- <target name="install-antcontrib" +- depends="antcontrib.download-check"> ++ <target name="install-antcontrib"> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> +- <fileset dir="${antcontrib.build.cache.dir}"> +- <include name="*.jar" /> ++ <fileset dir="/usr/share/java"> ++ <include name="ant-contrib.jar" /> + </fileset> + </classpath> + </taskdef> diff --git a/debian/patches/02_build_with_openjdk.diff b/debian/patches/02_build_with_openjdk.diff index 0036eae..fdcc372 100644 --- a/debian/patches/02_build_with_openjdk.diff +++ b/debian/patches/02_build_with_openjdk.diff @@ -1,31 +1,34 @@ Description: build.xml: Allow build with OpenJDK. Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-13 Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -35,9 +35,11 @@ - ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.java, - ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" /> - -+<!-- - <target name="checkIsJdk15" if="jdk15.not.present"> - <fail message="The 'jar' target (and dependent targets 'release', 'binzip') must be run under JDK 1.5." /> - </target> -+--> - - <condition property="jdk15.present"> - <contains string="${java.version}" substring="1.5." /> -@@ -122,10 +124,10 @@ - </target> - - <target name="compile" -- depends="init, compile.pre, compileJdk15, compileJdk16, compileJdk17, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post" -+ depends="init, compile.pre, compile.compile, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post" - description="Performs all the steps to prepare the bin directory with a complete compilation" /> - -- <target name="jar" depends="init, compile.pre, checkIsJdk15, compileJdk15, compileJdk16, compileJdk17, compile, compile-tests, set-build.id, generate.manifest" -+ <target name="jar" depends="init, compile.compile, compile.pre, compile, compile-tests, set-build.id, generate.manifest" - description="Jars up the bin directory after a compile"> - <zip destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar"> - <zipfileset dir="${basedir}" prefix="" +@@ -45,8 +45,6 @@ + src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java" /> + + <target name="checkJdkVersion" unless="jdk17.present"> +- <fail message="The 'jar' target (and dependent targets 'dist', 'binzip') +- must be run under JDK 1.7." /> + </target> + + <condition property="jdk15.present"> +@@ -141,7 +139,7 @@ + </target> + + <target name="compile" +- depends="init, compile.pre, compileJdk15, compileJdk16, compileJdk17, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post" ++ depends="init, compile.pre, compileJdk17, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post" + description="Performs all the steps to prepare the bin directory with a complete compilation" /> + + <target name="jar" depends="checkJdkVersion, compile, compile-tests, set-build.id, generate.manifest" +@@ -243,7 +241,9 @@ + <path refid="classpath" /> + </classpath> + <src path="${src.dir}" /> +- <include name="org/olap4j/driver/xmla/FactoryJdbc41Impl.java"/> ++ <exclude name="org/olap4j/driver/xmla/FactoryJdbc4Impl.java"/> ++ <exclude name="org/olap4j/driver/xmla/FactoryJdbc4Plus.java"/> ++ <exclude name="org/olap4j/driver/xmla/*Jdbc3*.java"/> + </javac> + </target> + diff --git a/debian/patches/03_use_debian_cup11a.diff b/debian/patches/03_use_debian_cup11a.diff deleted file mode 100644 index ce0ad7d..0000000 --- a/debian/patches/03_use_debian_cup11a.diff +++ /dev/null @@ -1,29 +0,0 @@ -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 <[email protected]> -Last-Update: 2009-12-13 -Forwarded: no ---- a/build.xml -+++ b/build.xml -@@ -255,12 +255,16 @@ - </target> - - <target name="parser"> -- <taskdef name="javacup" classname="java_cup.JavaCUPTask"> -+ <taskdef name="javacup" classname="java_cup.anttask.CUPTask"> - <classpath refid="classpath" /> - </taskdef> -- <javacup srcdir="${src.dir}" -- input="${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup" -- expect="61" interface="true" /> -+ <javacup -+ srcfile="${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup" -+ destdir="${src.dir}/org/olap4j/mdx/parser/impl/" -+ package="org.olap4j.mdx.parser.impl" -+ parser="DefaultMdxParser" -+ symbols="DefaultMdxParserSym" -+ expect="61" interface="true" /> - </target> - - <target name="clean-tests" depends="subfloor.clean-tests"> diff --git a/debian/patches/04_disable_hsql_test_data.diff b/debian/patches/04_disable_hsql_test_data.diff deleted file mode 100644 index a5c9dc6..0000000 --- a/debian/patches/04_disable_hsql_test_data.diff +++ /dev/null @@ -1,26 +0,0 @@ -Description: Removed foodmart database from tarball -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-13 -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -268,7 +268,7 @@ - </target> - - <target name="clean-tests" depends="subfloor.clean-tests"> -- <antcall target="init-hsql"/> -+ <!--<antcall target="init-hsql"/>--> - </target> - - <target name="clean-hsql"> -@@ -283,8 +283,8 @@ - </target> - - <target name="init-hsql" depends="clean-hsql"> -- <unzip src="${basedir}/foodmart/foodmart.zip" dest="${basedir}/foodmart/" -- overwrite="false" /> -+ <!--<unzip src="${basedir}/foodmart/foodmart.zip" dest="${basedir}/foodmart/" -+ overwrite="false" />--> - </target> - - <target name="init-tests" depends="clean-tests"> diff --git a/debian/patches/06_compatible_with_java7_encoding.diff b/debian/patches/06_compatible_with_java7_encoding.diff deleted file mode 100644 index c0e17f5..0000000 --- a/debian/patches/06_compatible_with_java7_encoding.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: olap4j-1.0.1.500/build.properties -=================================================================== ---- olap4j-1.0.1.500.orig/build.properties 2012-02-06 22:05:46.000000000 +0800 -+++ olap4j-1.0.1.500/build.properties 2013-07-19 03:44:29.274316512 +0800 -@@ -46,3 +46,7 @@ - #ydoc.home=/usr/local/ydoc-3.0-jdk1.5 - - # End build.properties -+ -+# Compatible with java7 encoding -+ant.build.javac.source=1.5 -+ant.build.javac.target=1.5 diff --git a/debian/patches/07_test_classpath.diff b/debian/patches/07_test_classpath.diff new file mode 100644 index 0000000..ee53ada --- /dev/null +++ b/debian/patches/07_test_classpath.diff @@ -0,0 +1,17 @@ +Description: Set the test classpath and use the Debian jars +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/subfloor.xml ++++ b/subfloor.xml +@@ -336,8 +336,9 @@ + <!-- Setup the classpath used for testing --> + <path id="test.classpath"> + <path refid="classpath"/> +- <fileset dir="${testlib.dir}"> +- <include name="*.jar" /> ++ <fileset dir="/usr/share/java"> ++ <include name="mondrian.jar" /> ++ <include name="eigenbase-properties.jar" /> + </fileset> + <pathelement location="${classes.dir}" /> + <pathelement location="${testclasses.dir}" /> diff --git a/debian/patches/08_source_encoding.diff b/debian/patches/08_source_encoding.diff new file mode 100644 index 0000000..2058a4c --- /dev/null +++ b/debian/patches/08_source_encoding.diff @@ -0,0 +1,13 @@ +Description: Set the source encoding to avoid 'unmappable character for encoding ASCII' errors +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -236,6 +236,7 @@ + fork="true" + source="1.7" + target="1.7" ++ encoding="ISO-8859-1" + includeantruntime="false"> + <classpath> + <path refid="classpath" /> diff --git a/debian/patches/javadoc_links.diff b/debian/patches/javadoc_links.diff index cd0f593..ad0f90e 100644 --- a/debian/patches/javadoc_links.diff +++ b/debian/patches/javadoc_links.diff @@ -1,37 +1,34 @@ -Description: Fix link of Javadoc HTML documentation - to use local API from /usr/share/doc/ +Description: Fix link of Javadoc HTML documentation to use local API from /usr/share/doc/ Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-12-13 Forwarded: not-needed - --- a/build.xml +++ b/build.xml -@@ -474,7 +474,7 @@ - <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> - <tag name="post" description="Post-condition:" scope="constructors,methods" /> - <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> -- <link href="http://download.oracle.com/javase/7/docs/api/"; /> -+ <link href="/usr/share/doc/default-jdk-doc/api/" /> - </javadoc> - </target> - -@@ -493,7 +493,7 @@ - <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> - <tag name="post" description="Post-condition:" scope="constructors,methods" /> - <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> -- <link href="http://download.oracle.com/javase/7/docs/api/"; /> -+ <link href="/usr/share/doc/default-jdk-doc/api/" /> - </javadoc> - </target> - -@@ -517,8 +517,8 @@ - <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> - <tag name="post" description="Post-condition:" scope="constructors,methods" /> - <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> -- <link href="http://download.oracle.com/javase/7/docs/api/"; /> -- <link href="http://junit.sourceforge.net/javadoc/"; /> -+ <link href="/usr/share/doc/default-jdk-doc/api/" /> -+ <link href="/usr/share/doc/junit-doc/doc/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"> - <param name="-author" /> +@@ -533,7 +533,7 @@ + <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> + <tag name="post" description="Post-condition:" scope="constructors,methods" /> + <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> +- <link href="http://download.oracle.com/javase/7/docs/api/"; /> ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> + </javadoc> + </target> + +@@ -552,7 +552,7 @@ + <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> + <tag name="post" description="Post-condition:" scope="constructors,methods" /> + <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> +- <link href="http://download.oracle.com/javase/7/docs/api/"; /> ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> + </javadoc> + </target> + +@@ -576,8 +576,8 @@ + <tag name="pre" description="Pre-condition:" scope="constructors,methods" /> + <tag name="post" description="Post-condition:" scope="constructors,methods" /> + <tag name="testcase" description="Test-case:" scope="constructors,methods,types" /> +- <link href="http://download.oracle.com/javase/7/docs/api/"; /> +- <link href="http://junit.sourceforge.net/javadoc/"; /> ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> ++ <link href="/usr/share/doc/junit-doc/doc/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"> + <param name="-author" /> diff --git a/debian/patches/series b/debian/patches/series index 9db7f2c..4106ead 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 01_disable_ivy.diff 02_build_with_openjdk.diff -03_use_debian_cup11a.diff -04_disable_hsql_test_data.diff javadoc_links.diff -06_compatible_with_java7_encoding.diff +07_test_classpath.diff +08_source_encoding.diff diff --git a/debian/rules b/debian/rules index 0ad6abe..35f3dbe 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := cup log4j-1.2 xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib +DEB_JARS := log4j-1.2 xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib DEB_ANT_BUILD_TARGET := version-properties jar xmla-jar tck-jar javadoc # olap4j need mondrian for testing. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/olap4j.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
