This is an automated email from the git hooks/post-receive script. eighthave pushed a commit to branch master in repository lombok-ast.
commit 22b6da4a1a4bb2e6b2de61ac2311ac557d428551 Author: Hans-Christoph Steiner <[email protected]> Date: Fri Dec 18 10:40:49 2015 +0100 remove fuzz from patches to stop the build complaining --- debian/patches/add_maven_repo.patch | 6 ++--- debian/patches/fix_java7_build.patch | 8 +++--- debian/patches/parboiled.patch | 30 +++++++++------------- .../patches/remove_dependency_on_ensure-ipp.patch | 6 ++--- debian/patches/remove_missing_dependency.patch | 6 ++--- debian/patches/use_https_always.patch | 19 +++----------- 6 files changed, 27 insertions(+), 48 deletions(-) diff --git a/debian/patches/add_maven_repo.patch b/debian/patches/add_maven_repo.patch index 4dd9244..b0161be 100644 --- a/debian/patches/add_maven_repo.patch +++ b/debian/patches/add_maven_repo.patch @@ -1,7 +1,5 @@ -Index: lombok-ast-0.2.3/buildScripts/ivysettings.xml -=================================================================== ---- lombok-ast-0.2.3.orig/buildScripts/ivysettings.xml -+++ lombok-ast-0.2.3/buildScripts/ivysettings.xml +--- a/buildScripts/ivysettings.xml ++++ b/buildScripts/ivysettings.xml @@ -1,10 +1,14 @@ <ivysettings> <resolvers> diff --git a/debian/patches/fix_java7_build.patch b/debian/patches/fix_java7_build.patch index 9e5659b..1e5acea 100644 --- a/debian/patches/fix_java7_build.patch +++ b/debian/patches/fix_java7_build.patch @@ -8,7 +8,7 @@ Description: building with openjdk-7 dies with an error --- a/build.xml +++ b/build.xml -@@ -68,7 +68,7 @@ +@@ -57,7 +57,7 @@ <taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" /> </target> @@ -17,7 +17,7 @@ Description: building with openjdk-7 dies with an error <mkdir dir="build/lombok.ast" /> <ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> <java -@@ -76,6 +76,7 @@ +@@ -65,6 +65,7 @@ classpath="build/lombok.ast" failonerror="true" output="build/version.txt" /> @@ -25,7 +25,7 @@ Description: building with openjdk-7 dies with an error <echo level="info">Lombok ast version: ${lombok.ast.version}</echo> </target> -@@ -93,7 +94,7 @@ +@@ -82,7 +83,7 @@ </target> <target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor."> @@ -34,7 +34,7 @@ Description: building with openjdk-7 dies with an error <classpath refid="build.path" /> </ivy:compile> <mkdir dir="build/templateProcessor/META-INF" /> -@@ -202,7 +203,7 @@ +@@ -191,7 +192,7 @@ <ivy:show-html file="build/cobertura/index.html" /> </target> diff --git a/debian/patches/parboiled.patch b/debian/patches/parboiled.patch index c61f19a..cf446fe 100644 --- a/debian/patches/parboiled.patch +++ b/debian/patches/parboiled.patch @@ -1,8 +1,6 @@ -Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/ProfilerParseRunner.java -=================================================================== ---- lombok-ast-0.2.3.orig/src/main/lombok/ast/grammar/ProfilerParseRunner.java -+++ lombok-ast-0.2.3/src/main/lombok/ast/grammar/ProfilerParseRunner.java -@@ -27,7 +27,7 @@ import java.util.TreeSet; +--- a/src/main/lombok/ast/grammar/ProfilerParseRunner.java ++++ b/src/main/lombok/ast/grammar/ProfilerParseRunner.java +@@ -27,7 +27,7 @@ import lombok.Data; @@ -11,11 +9,9 @@ Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/ProfilerParseRunner.java import org.parboiled.MatchHandler; import org.parboiled.MatcherContext; import org.parboiled.Rule; -Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/Source.java -=================================================================== ---- lombok-ast-0.2.3.orig/src/main/lombok/ast/grammar/Source.java -+++ lombok-ast-0.2.3/src/main/lombok/ast/grammar/Source.java -@@ -37,7 +37,7 @@ import lombok.ast.Node; +--- a/src/main/lombok/ast/grammar/Source.java ++++ b/src/main/lombok/ast/grammar/Source.java +@@ -37,7 +37,7 @@ import lombok.ast.Position; import org.parboiled.Context; @@ -24,11 +20,9 @@ Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/Source.java import org.parboiled.errors.ParseError; import org.parboiled.support.ParsingResult; -Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/BasicsParser.java -=================================================================== ---- lombok-ast-0.2.3.orig/src/main/lombok/ast/grammar/BasicsParser.java -+++ lombok-ast-0.2.3/src/main/lombok/ast/grammar/BasicsParser.java -@@ -31,7 +31,7 @@ import org.parboiled.BaseParser; +--- a/src/main/lombok/ast/grammar/BasicsParser.java ++++ b/src/main/lombok/ast/grammar/BasicsParser.java +@@ -31,7 +31,7 @@ import org.parboiled.MatcherContext; import org.parboiled.Rule; import org.parboiled.annotations.SuppressSubnodes; @@ -37,7 +31,7 @@ Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/BasicsParser.java import org.parboiled.support.Characters; /** -@@ -106,7 +106,7 @@ public class BasicsParser extends BasePa +@@ -106,7 +106,7 @@ return new JavaIdentifierPartMatcher(); } @@ -46,7 +40,7 @@ Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/BasicsParser.java public JavaIdentifierPartMatcher() { super(Characters.of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$")); } -@@ -122,7 +122,7 @@ public class BasicsParser extends BasePa +@@ -122,7 +122,7 @@ } } @@ -55,7 +49,7 @@ Index: lombok-ast-0.2.3/src/main/lombok/ast/grammar/BasicsParser.java public JavaIdentifierStartMatcher() { super(Characters.of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$")); } -@@ -175,4 +175,4 @@ public class BasicsParser extends BasePa +@@ -175,4 +175,4 @@ public Rule lineTerminator() { return FirstOf(String("\r\n").label("\\r\\n"), Ch('\r').label("\\r"), Ch('\n').label("\\n")); } diff --git a/debian/patches/remove_dependency_on_ensure-ipp.patch b/debian/patches/remove_dependency_on_ensure-ipp.patch index 73c30f0..7ca86ce 100644 --- a/debian/patches/remove_dependency_on_ensure-ipp.patch +++ b/debian/patches/remove_dependency_on_ensure-ipp.patch @@ -14,7 +14,7 @@ </fileset> </path> -@@ -65,7 +68,7 @@ +@@ -65,7 +57,7 @@ <taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" /> </target> @@ -23,7 +23,7 @@ <mkdir dir="build/lombok.ast" /> <ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> <java -@@ -73,7 +76,6 @@ +@@ -73,7 +65,6 @@ classpath="build/lombok.ast" failonerror="true" output="build/version.txt" /> @@ -31,7 +31,7 @@ <echo level="info">Lombok ast version: ${lombok.ast.version}</echo> </target> -@@ -200,7 +202,7 @@ +@@ -200,7 +191,7 @@ <ivy:show-html file="build/cobertura/index.html" /> </target> diff --git a/debian/patches/remove_missing_dependency.patch b/debian/patches/remove_missing_dependency.patch index 4cbce6e..492755b 100644 --- a/debian/patches/remove_missing_dependency.patch +++ b/debian/patches/remove_missing_dependency.patch @@ -1,7 +1,5 @@ -Index: lombok-ast-0.2.3/buildScripts/ivy.xml -=================================================================== ---- lombok-ast-0.2.3.orig/buildScripts/ivy.xml -+++ lombok-ast-0.2.3/buildScripts/ivy.xml +--- a/buildScripts/ivy.xml ++++ b/buildScripts/ivy.xml @@ -7,18 +7,15 @@ <conf name="contrib" /> </configurations> diff --git a/debian/patches/use_https_always.patch b/debian/patches/use_https_always.patch index eed91e6..767326c 100644 --- a/debian/patches/use_https_always.patch +++ b/debian/patches/use_https_always.patch @@ -25,7 +25,7 @@ Description: always use HTTPS when downloading jars <fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail> </target> -@@ -227,7 +227,7 @@ +@@ -219,7 +219,7 @@ <target name="fetchJLS" unless="jls-available"> <mkdir dir="doc/jls" /> @@ -34,7 +34,7 @@ Description: always use HTTPS when downloading jars <unzip src="doc/jls/langspec-3.0.zip" dest="doc/jls" /> <delete file="doc/jls/langspec-3.0.zip" /> </target> -@@ -276,7 +276,7 @@ +@@ -268,7 +268,7 @@ <classpath location="build/templateProcessor.jar" /> <classpath refid="build.path" /> <link href="http://download.oracle.com/javase/6/docs/api/"; /> @@ -43,7 +43,7 @@ Description: always use HTTPS when downloading jars <bottom><![CDATA[<i>Copyright © 2010-2011 The Project Lombok Authors, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT licence</a>.]]></bottom> </javadoc> <!-- bugfix for boneheaded javadoc bug where ?is-external=true is inserted before an anchor ref, breaking the anchor ref. -@@ -378,7 +378,7 @@ +@@ -370,7 +370,7 @@ <srcdir dir="test/src" test="true" /> </module> <settings> @@ -52,7 +52,7 @@ Description: always use HTTPS when downloading jars </settings> <apt enabled="true" /> </ivy:intellijgen> -@@ -397,7 +397,7 @@ +@@ -389,7 +389,7 @@ <conf name="build" sources="contrib" /> <conf name="test" sources="contrib" /> <settings> @@ -107,14 +107,3 @@ Description: always use HTTPS when downloading jars + <artifact conf="build" url="https://projectlombok.org/ivyrepo/tools/ant-jsch-fixed.jar"; /> </publications> </ivy-module> ---- a/buildScripts/ivysettings.xml -+++ b/buildScripts/ivysettings.xml -@@ -4,7 +4,7 @@ - <filesystem name="projectLocalRepo"> - <ivy pattern="${ivy.settings.dir}/ivy-repo/[organization]-[module]-[revision].xml" /> - </filesystem> -- <ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2"; /> -+ <ibiblio name="maven-repo2" m2compatible="true" root="https://repo1.maven.org/maven2"; /> - </chain> - </resolvers> - <settings defaultResolver="projectRepos" /> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok-ast.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
