This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit 1b70533b7449be48760b7d210a994886d89fbf0b Author: Hideki Yamane <[email protected]> Date: Sun Jul 2 09:26:02 2017 +0900 drop reproducible_build.patch --- debian/changelog | 2 ++ debian/patches/reproducible_build.patch | 19 ------------------- debian/patches/series | 1 - debian/rules | 2 +- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 996dc17..73402f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pleiades (1.7.27-1) UNRELEASED; urgency=medium - refresh patches - drop 0005-do-not-ask-timestamp.digicert.com-to-sign.patch: unnecessary patch + - drop reproducible_build.patch: done by build option, instead. * debian/compat - set 10 * debian/control @@ -14,6 +15,7 @@ pleiades (1.7.27-1) UNRELEASED; urgency=medium two libraries source into pleiades * debian/rules - simplify with dh10 + - use -Dnosign=true to reproducible build * debian/copyright - update since Apache commons is included in src - drop unnecessary srctest/jp/sourceforge/mergedoc/pleiades/resource/3.* diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch deleted file mode 100644 index b0fcaed..0000000 --- a/debian/patches/reproducible_build.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Make the build reproducible -Author: Chris Lamb <[email protected]> -Last-Update: 2016-08-27 - ---- a/build.xml -+++ b/build.xml -@@ -234,12 +234,6 @@ - - <!-- JAR 署名 (プロキシ環境でのテストビルド用に VM 引数に -Dnosign=true が指定されている場合は署名しない) --> - <target name="exec.signjar" unless="nosign"> -- <signjar keystore=".keystore" alias="MergeDoc" storepass="mergedoc" tsaurl="http://timestamp.digicert.com";> -- <sysproperty key="file.encoding" value="UTF-8" /> -- <fileset dir="."> -- <include name="*/${project.id}.jar" /> -- </fileset> -- </signjar> - </target> - - <!-- signjar で使用する keystore 作成 --> diff --git a/debian/patches/series b/debian/patches/series index 18c0f6d..c5469f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ disable-create-src_zip build.xml compile_junit.patch not_run_integrate.patch -reproducible_build.patch diff --git a/debian/rules b/debian/rules index 06fc648..cca6df1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ REMOVE_FILES="srctest/jp/sourceforge/mergedoc/pleiades/resource/3.*" dh $@ override_dh_auto_build: - ant -Dbin.dir=$(CURDIR)/build/bin -Dbuild.dir=$(CURDIR)/build build.full + ant -Dbin.dir=$(CURDIR)/build/bin -Dbuild.dir=$(CURDIR)/build build.full -Dnosign=true override_dh_auto_install: unzip -q -d $(CURDIR)/debian/$(packagename)/$(eclipse_dir) $(CURDIR)/build/nightly/$(packagename).zip -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pleiades.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
