This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository olap4j.
commit da4f3f537f34ae969f858cb53d417c6311e37687 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 20 18:30:08 2015 +0200 Set the locale when generating the javadoc and remove the timestamps --- debian/changelog | 2 ++ debian/patches/10_javadoc_tweaks.diff | 22 ++++++++++++++++++++++ debian/patches/javadoc_links.diff | 34 ---------------------------------- debian/patches/series | 2 +- 4 files changed, 25 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ba07b9..9b094c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ olap4j (1.2.0-1) UNRELEASED; urgency=medium * New upstream release: - Refreshed the patches - Replaced the build dependency on cup with javacc + * Improved the reproducibility: + - Set the locale when generating the javadoc and remove the timestamps * debian/control: - Standards-Version updated to 3.9.6 (no changes) * Use XZ compression for the upstream tarball diff --git a/debian/patches/10_javadoc_tweaks.diff b/debian/patches/10_javadoc_tweaks.diff new file mode 100644 index 0000000..73363fe --- /dev/null +++ b/debian/patches/10_javadoc_tweaks.diff @@ -0,0 +1,22 @@ +Description: Fix link of Javadoc HTML documentation to use local API from /usr/share/doc/. + Make the Javadoc reproducible. +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -530,13 +530,12 @@ + destdir="${javadoc.dir}" packagenames="org.olap4j.*" + excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*" + overview="${src.dir}/overview.html" +- footer="<a href="http://sourceforge.net/projects/olap4j"><img src="http://sourceforge.net/sflogo.php?group_id=168953&type=1" width="88" height="31" border="0" alt="SourceForge.net_Logo"></a>" + author="true" source="1.5" access="public" +- Windowtitle="olap4j, version ${project.revision}" additionalparam="-linksource"> ++ Windowtitle="olap4j, version ${project.revision}" additionalparam="-notimestamp" locale="en"> + <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> + diff --git a/debian/patches/javadoc_links.diff b/debian/patches/javadoc_links.diff deleted file mode 100644 index ad0f90e..0000000 --- a/debian/patches/javadoc_links.diff +++ /dev/null @@ -1,34 +0,0 @@ -Description: Fix link of Javadoc HTML documentation to use local API from /usr/share/doc/ -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -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 4106ead..e125754 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 01_disable_ivy.diff 02_build_with_openjdk.diff -javadoc_links.diff 07_test_classpath.diff 08_source_encoding.diff +10_javadoc_tweaks.diff -- 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
