This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch experimental in repository lombok.
commit a8510b4a50086bd81fdc9a15a193b93a1226ffcc Author: tony mancill <[email protected]> Date: Sun Aug 13 22:04:06 2017 -0700 Refresh patches for new upstream version --- debian/patches/Javac.patch | 16 +++++++--------- debian/patches/build.patch | 12 +++++------- debian/patches/javadoc.patch | 12 +++++------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/debian/patches/Javac.patch b/debian/patches/Javac.patch index d7c029f..8e28109 100644 --- a/debian/patches/Javac.patch +++ b/debian/patches/Javac.patch @@ -10,19 +10,17 @@ Debian-Bug: https://bugs.debian.org/814764 src/utils/lombok/javac/Javac.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -diff --git a/src/utils/lombok/javac/Javac.java b/src/utils/lombok/javac/Javac.java -index 003281a..da2d446 100644 --- a/src/utils/lombok/javac/Javac.java +++ b/src/utils/lombok/javac/Javac.java -@@ -41,6 +41,7 @@ import lombok.javac.JavacTreeMaker.TypeTag; - +@@ -42,6 +42,7 @@ import com.sun.tools.javac.code.Source; + import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Type; +import com.sun.tools.javac.code.Symbol.TypeSymbol; import com.sun.tools.javac.main.JavaCompiler; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCClassDecl; -@@ -51,6 +52,8 @@ import com.sun.tools.javac.tree.JCTree.JCIdent; +@@ -52,6 +53,8 @@ import com.sun.tools.javac.tree.JCTree.JCLiteral; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; @@ -31,16 +29,16 @@ index 003281a..da2d446 100644 /** * Container for static utility methods relevant to lombok's operation on javac. */ -@@ -311,7 +314,7 @@ public class Javac { - - public static Type createVoidType(JavacTreeMaker maker, TypeTag tag) { +@@ -326,7 +329,7 @@ + } catch (IllegalAccessException ignore) {} + if (Javac.getJavaCompilerVersion() < 8) { - return new JCNoType(((Integer) tag.value).intValue()); + return null; } else { try { if (CTC_VOID.equals(tag)) { -@@ -328,14 +331,19 @@ public class Javac { +@@ -343,14 +346,19 @@ } private static class JCNoType extends Type implements NoType { diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 0f94f70..84386e4 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -10,11 +10,9 @@ Forwarded: not-needed build.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) -diff --git a/build.xml b/build.xml -index e157632..b9caba7 100644 --- a/build.xml +++ b/build.xml -@@ -33,6 +33,18 @@ the common tasks and can be called on to run the main aspects of all the sub-scr +@@ -33,6 +33,18 @@ <fileset dir="lib/build"> <include name="*.jar" /> </fileset> @@ -33,7 +31,7 @@ index e157632..b9caba7 100644 </path> <path id="runtime.path"> -@@ -90,12 +102,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr +@@ -90,12 +102,12 @@ <target name="ensure-ipp" depends="load-ipp, redownload-ipp" /> @@ -48,7 +46,7 @@ index e157632..b9caba7 100644 <target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast."> <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj7, ecj8" /> -@@ -119,7 +131,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr +@@ -119,7 +131,7 @@ <ivy:retrieve /> </target> @@ -57,8 +55,8 @@ index e157632..b9caba7 100644 <mkdir dir="build/lombok" /> <javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" source="1.5" target="1.5" includes="lombok/core/Version.java" includeantruntime="false" /> <java -@@ -131,13 +143,13 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - <echo level="info">Lombok version: ${lombok.version}</echo> +@@ -139,13 +151,13 @@ + <echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo> </target> - <target name="-unpackLibs" depends="ensureRuntimeDeps"> diff --git a/debian/patches/javadoc.patch b/debian/patches/javadoc.patch index ef6596d..9b9bf19 100644 --- a/debian/patches/javadoc.patch +++ b/debian/patches/javadoc.patch @@ -10,11 +10,9 @@ Forwarded: not-needed buildScripts/website.ant.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml -index aae2285..23a13d7 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml -@@ -188,8 +188,6 @@ such as converting the changelog into HTML, and creating javadoc. +@@ -95,8 +95,6 @@ </tar> </target> @@ -23,12 +21,12 @@ index aae2285..23a13d7 100644 <target name="website-publish" depends="website, -requires-ssh"> <scp localFile="dist/website.tar.bz2" -@@ -331,7 +329,7 @@ such as converting the changelog into HTML, and creating javadoc. +@@ -171,7 +169,7 @@ check the <a href="lombok/package-summary.html">lombok</a> package. If you're trying to extend lombok or write your own plugins, the other packages are what you're looking for.</body></html> ]]></echo> - <javadoc sourcepath="src/core" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}"> + <javadoc sourcepath="src/core" locale="en" encoding="UTF-8" additionalparam="-notimestamp" defaultexcludes="yes" destdir="build/api" windowtitle="Lombok" Overview="${javadoc.overview.html}"> - <classpath refid="build.path" /> - <classpath location="build/lombok" /> - <link href="http://download.oracle.com/javase/6/docs/api/"; /> + <package name="lombok" /> + <package name="lombok.experimental" /> + <package name="lombok.extern.*" /> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
