This is an automated email from the git hooks/post-receive script. henrich pushed a commit to branch master in repository pleiades.
commit bb3255553462c94d3db9cb3b7dfccd0c2d6bfa3e Author: Hideki Yamane <[email protected]> Date: Sun Jul 2 08:10:20 2017 +0900 refersh patches --- debian/changelog | 4 ++ ...do-not-ask-timestamp.digicert.com-to-sign.patch | 24 --------- debian/patches/build.xml | 57 +++++++++++++--------- debian/patches/compile_junit.patch | 10 ++-- debian/patches/disable-create-src_zip | 6 +-- debian/patches/not_run_integrate.patch | 6 +-- debian/patches/reproducible_build.patch | 20 ++++---- debian/patches/series | 1 - 8 files changed, 54 insertions(+), 74 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34956b8..622c3b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ pleiades (1.7.27-1) UNRELEASED; urgency=medium * New upstream release + * debian/patches + - refresh patches + - drop 0005-do-not-ask-timestamp.digicert.com-to-sign.patch: + unnecessary patch -- Hideki Yamane <[email protected]> Sun, 02 Jul 2017 07:45:36 +0900 diff --git a/debian/patches/0005-do-not-ask-timestamp.digicert.com-to-sign.patch b/debian/patches/0005-do-not-ask-timestamp.digicert.com-to-sign.patch deleted file mode 100644 index 79c086c..0000000 --- a/debian/patches/0005-do-not-ask-timestamp.digicert.com-to-sign.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Hideki Yamane <[email protected]> -Date: Tue, 17 Nov 2015 21:53:12 +0900 -Subject: do not ask timestamp.digicert.com to sign - -because debian package build should not connect to other host, should be -complete inside build host ---- - build.xml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/build.xml b/build.xml -index 6a235dc..af5da2e 100644 ---- a/build.xml -+++ b/build.xml -@@ -219,8 +219,7 @@ - <jar destfile="plugins/${project.id}.jar" basedir="./plugins/${project.id}" - manifest="plugins/${project.id}/META-INF/MANIFEST.MF"/> - <jar destfile="features/${project.id}.jar" basedir="./features/${project.id}" /> -- <signjar keystore=".keystore" alias="MergeDoc" storepass="mergedoc" -- tsaurl="http://timestamp.digicert.com";> -+ <signjar keystore=".keystore" alias="MergeDoc" storepass="mergedoc"> - <sysproperty key="file.encoding" value="UTF-8" /> - <fileset dir="."> - <include name="*/${project.id}.jar" /> diff --git a/debian/patches/build.xml b/debian/patches/build.xml index c9ac353..bf98c3c 100644 --- a/debian/patches/build.xml +++ b/debian/patches/build.xml @@ -6,11 +6,9 @@ Subject: build.xml build.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) -Index: pleiades/build.xml -=================================================================== ---- pleiades.orig/build.xml 2016-07-07 13:34:32.453310401 +0200 -+++ pleiades/build.xml 2016-07-07 13:35:54.413176448 +0200 -@@ -56,9 +56,10 @@ +--- a/build.xml ++++ b/build.xml +@@ -42,9 +42,10 @@ <pathelement location="bintest" /> <pathelement location="srctest" /> <pathelement location="conf" /> @@ -23,25 +21,24 @@ Index: pleiades/build.xml + <pathelement location="/usr/share/java/junit.jar"/> </path> - <!-- Windows の場合は true --> -@@ -120,7 +121,15 @@ + <!-- OS 条件 --> +@@ -107,7 +108,14 @@ </fileset> <manifest> <attribute name="Premain-Class" value="${project.id}.Pleiades" /> -- <attribute name="Boot-Class-Path" value="./${agent.jar.name} ./conf ./lib/javassist/javassist.jar ./lib/apache/commons-io.jar ./lib/apache/commons-lang.jar" /> -+ <attribute name="Boot-Class-Path" value="./${agent.jar.name} ./conf -+ /usr/share/java/javassist.jar -+ /usr/share/java/commons-io.jar -+ /usr/share/java/commons-lang.jar" /> -+ <attribute name="Class-Path" -+ value="/usr/share/java/javassist.jar -+ /usr/share/java/commons-io.jar -+ /usr/share/java/commons-lang.jar" /> -+ +- <attribute name="Boot-Class-Path" value="./${agent.jar.name} ./conf ./lib/javassist/javassist.jar" /> ++ <attribute name="Boot-Class-Path" value="./${agent.jar.name} ./conf ++ /usr/share/java/javassist.jar ++ /usr/share/java/commons-io.jar ++ /usr/share/java/commons-lang.jar" /> ++ <attribute name="Class-Path" ++ value="/usr/share/java/javassist.jar ++ /usr/share/java/commons-io.jar ++ /usr/share/java/commons-lang.jar" /> </manifest> </jar> -@@ -129,6 +138,7 @@ +@@ -116,6 +124,7 @@ <copy todir="plugins/${project.id}"> <fileset dir="${basedir}"> <exclude name="debian/" /> @@ -49,15 +46,27 @@ Index: pleiades/build.xml <exclude name=".settings/*" /> <exclude name="about/" /> <exclude name="bin/" /> -@@ -296,7 +306,10 @@ +@@ -284,18 +293,11 @@ <target name="javac" depends=""> <mkdir dir="${bin.dir}" /> -- <javac srcdir="src" destdir="${bin.dir}" classpathref="project.classpath" encoding="UTF-8" source="1.5" target="1.5" debug="on" /> -+ <javac srcdir="src" destdir="${bin.dir}" classpathref="project.classpath" encoding="UTF-8" debug="on"> -+ <compilerarg value="-Xlint:deprecation" /> -+ <compilerarg value="-Xlint:-options" /> -+ </javac> +- <javac +- srcdir="src" +- destdir="${bin.dir}" +- classpathref="project.classpath" +- encoding="UTF-8" +- source="1.6" +- target="1.6" +- debug="on" +- includeantruntime="false" +- > +- <compilerarg value="-Xlint:none" /> +- </javac> ++ <javac srcdir="src" destdir="${bin.dir}" classpathref="project.classpath" encoding="UTF-8" debug="on"> ++ <compilerarg value="-Xlint:deprecation" /> ++ <compilerarg value="-Xlint:-options" /> ++ </javac> ++ </target> diff --git a/debian/patches/compile_junit.patch b/debian/patches/compile_junit.patch index 5de7573..d9120b0 100644 --- a/debian/patches/compile_junit.patch +++ b/debian/patches/compile_junit.patch @@ -7,12 +7,10 @@ Author: Hideki Yamane <[email protected]> build.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -Index: pleiades/build.xml -=================================================================== ---- pleiades.orig/build.xml 2016-07-07 13:36:04.729185464 +0200 -+++ pleiades/build.xml 2016-07-07 13:36:45.521260755 +0200 -@@ -324,7 +324,21 @@ - --> +--- a/build.xml ++++ b/build.xml +@@ -306,7 +306,21 @@ + </target> <!-- ユニット・テスト --> - <target name="test.unit" description=""> diff --git a/debian/patches/disable-create-src_zip b/debian/patches/disable-create-src_zip index ff957ac..614e5cf 100644 --- a/debian/patches/disable-create-src_zip +++ b/debian/patches/disable-create-src_zip @@ -6,11 +6,9 @@ Subject: disable-create-src_zip build.xml | 19 ------------------- 1 file changed, 19 deletions(-) -diff --git a/build.xml b/build.xml -index 215f223..344a4f6 100644 --- a/build.xml +++ b/build.xml -@@ -242,25 +242,6 @@ +@@ -215,23 +215,6 @@ <delete dir="plugins" /> <delete dir="features" /> @@ -22,10 +20,8 @@ index 215f223..344a4f6 100644 - <exclude name="bin/**/*"/> - --> - <exclude name="bintest/**/*" /> -- <exclude name="conf/props/history/" /> - <exclude name="conf/props/temp/" /> - <exclude name="conf/props/**/.*" /> -- <exclude name="nls/" /> - <exclude name="report/" /> - <exclude name="build/" /> - <!-- コマンドでエラーになるため追加 --> diff --git a/debian/patches/not_run_integrate.patch b/debian/patches/not_run_integrate.patch index 88a828b..d9a6b0b 100644 --- a/debian/patches/not_run_integrate.patch +++ b/debian/patches/not_run_integrate.patch @@ -7,11 +7,9 @@ Author: Hideki Yamane <[email protected]> build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build.xml b/build.xml -index 8be7f30..6a235dc 100644 --- a/build.xml +++ b/build.xml -@@ -311,7 +311,7 @@ +@@ -302,7 +302,7 @@ </target> <!-- ビルド (コマンドライン用) --> @@ -19,4 +17,4 @@ index 8be7f30..6a235dc 100644 + <target name="build.full" depends="clean, javac, test.unit, build"> </target> - <!-- + <!-- ユニット・テスト --> diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch index 285e5dc..b0fcaed 100644 --- a/debian/patches/reproducible_build.patch +++ b/debian/patches/reproducible_build.patch @@ -2,18 +2,18 @@ Description: Make the build reproducible Author: Chris Lamb <[email protected]> Last-Update: 2016-08-27 ---- pleiades-1.7.0.orig/build.xml -+++ pleiades-1.7.0/build.xml -@@ -219,12 +219,6 @@ - <jar destfile="plugins/${project.id}.jar" basedir="./plugins/${project.id}" - manifest="plugins/${project.id}/META-INF/MANIFEST.MF"/> - <jar destfile="features/${project.id}.jar" basedir="./features/${project.id}" /> -- <signjar keystore=".keystore" alias="MergeDoc" storepass="mergedoc"> +--- 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> - <unjar src="plugins/${project.id}.jar" dest="./plugins/${project.id}"> - <patternset> - <include name="META-INF/*" /> + </target> + + <!-- signjar で使用する keystore 作成 --> diff --git a/debian/patches/series b/debian/patches/series index ad91ce4..18c0f6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ disable-create-src_zip build.xml compile_junit.patch not_run_integrate.patch -0005-do-not-ask-timestamp.digicert.com-to-sign.patch reproducible_build.patch -- 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
