This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository liboro-java.
commit 93e97be0d4655dba0c23c56bd1709bdab4ff8a9b Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 27 15:03:25 2016 +0200 Merged the patches fixing the reproducibility of the javadoc --- ...tamps-in-javadoc.patch => 02-reproducible-javadoc.patch} | 5 +++-- debian/patches/03-set-javadoc-locale.patch | 13 ------------- debian/patches/series | 3 +-- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/debian/patches/02-remove-timestamps-in-javadoc.patch b/debian/patches/02-reproducible-javadoc.patch similarity index 86% rename from debian/patches/02-remove-timestamps-in-javadoc.patch rename to debian/patches/02-reproducible-javadoc.patch index 8328091..03efdb6 100644 --- a/debian/patches/02-remove-timestamps-in-javadoc.patch +++ b/debian/patches/02-reproducible-javadoc.patch @@ -1,13 +1,14 @@ -Description: Remove the timestamps from the Javadoc to make the build reproducible +Description: Make the javadoc reproducible Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -159,6 +159,7 @@ +@@ -159,6 +159,8 @@ version="true" windowtitle="${name} ${version} API" doctitle="${name} ${version} API" + additionalparam="-notimestamp" ++ locale="en_US" header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>" bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."> </javadoc> diff --git a/debian/patches/03-set-javadoc-locale.patch b/debian/patches/03-set-javadoc-locale.patch deleted file mode 100644 index 93f60b0..0000000 --- a/debian/patches/03-set-javadoc-locale.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Set the locale used for the javadoc to make the build reproducible -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -160,6 +160,7 @@ - windowtitle="${name} ${version} API" - doctitle="${name} ${version} API" - additionalparam="-notimestamp" -+ locale="en_US" - header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>" - bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."> - </javadoc> diff --git a/debian/patches/series b/debian/patches/series index fefd376..0c256fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01-build-xml-dont-replace-non-existing-file.patch -02-remove-timestamps-in-javadoc.patch -03-set-javadoc-locale.patch +02-reproducible-javadoc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/liboro-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
