This is an automated email from the git hooks/post-receive script. eighthave pushed a commit to branch master in repository lombok-ast.
commit 54f1a9331e51ac3adc32670397266f69744b9977 Author: Komal Sukhani <[email protected]> Date: Tue Oct 20 19:16:15 2015 +0530 Upload partial work --- debian/README.Debian | 6 ++ debian/README.source | 10 +++ debian/changelog | 5 ++ debian/compat | 1 + debian/control | 15 ++++ debian/copyright | 38 +++++++++ debian/docs | 0 debian/patches/add_maven_repo.patch | 22 ++++++ debian/patches/create_build_directory.patch | 20 +++++ debian/patches/parboiled.patch | 64 +++++++++++++++ .../patches/remove_dependency_on_ensure-ipp.patch | 30 +++++++ debian/patches/remove_missing_dependency.patch | 26 +++++++ debian/patches/replace_ipp_with_ivy.patch | 91 ++++++++++++++++++++++ debian/patches/series | 6 ++ debian/rules | 32 ++++++++ debian/source/format | 1 + 16 files changed, 367 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..6e7e151 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +lombok-ast for Debian +--------------------- + +<possible notes regarding this package - if none, delete this file> + + -- Komal Sukhani <[email protected]> Thu, 30 Jul 2015 12:23:07 +0530 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..44a628b --- /dev/null +++ b/debian/README.source @@ -0,0 +1,10 @@ +lombok-ast for Debian +--------------------- + +<this file describes information about the source package, see Debian policy +manual section 4.14. You WILL either need to modify or delete this file> + + + + -- Komal Sukhani <[email protected]> Thu, 30 Jul 2015 12:23:07 +0530 + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..440a7ed --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +lombok-ast (0.2.3-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + + -- Komal Sukhani <[email protected]> Thu, 30 Jul 2015 12:23:07 +0530 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..19d761c --- /dev/null +++ b/debian/control @@ -0,0 +1,15 @@ +Source: lombok-ast +Section: unknown +Priority: optional +Maintainer: Komal Sukhani <[email protected]> +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.5 +Homepage: <insert the upstream URL, if relevant> +#Vcs-Git: git://anonscm.debian.org/collab-maint/lombok-ast.git +#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lombok-ast.git;a=summary + +Package: lombok-ast +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: <insert up to 60 chars description> + <insert long description, indented with spaces> diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..3fe6c80 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lombok-ast +Source: <url://example.com> + +Files: * +Copyright: <years> <put author's name and email here> + <years> <likewise for another author> +License: <special license> + <Put the license of the package here indented by 1 space> + <This follows the format of Description: lines in control file> + . + <Including paragraphs> + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2015 Komal Sukhani <[email protected]> +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e69de29 diff --git a/debian/patches/add_maven_repo.patch b/debian/patches/add_maven_repo.patch new file mode 100644 index 0000000..4dd9244 --- /dev/null +++ b/debian/patches/add_maven_repo.patch @@ -0,0 +1,22 @@ +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 +@@ -1,10 +1,14 @@ + <ivysettings> + <resolvers> + <chain name="projectRepos"> +- <filesystem name="projectLocalRepo"> +- <ivy pattern="${ivy.settings.dir}/ivy-repo/[organization]-[module]-[revision].xml" /> ++ <filesystem name="maven_repo"> ++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" /> ++ <artifact pattern="/usr/share/java/[artifact].[ext]" /> ++ </filesystem> ++ <filesystem name="tempRepo"> ++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" /> ++ <artifact pattern="${ivy.settings.dir}/temp/[artifact].[ext]" /> + </filesystem> +- <ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2"; /> + </chain> + </resolvers> + <settings defaultResolver="projectRepos" /> diff --git a/debian/patches/create_build_directory.patch b/debian/patches/create_build_directory.patch new file mode 100644 index 0000000..8568230 --- /dev/null +++ b/debian/patches/create_build_directory.patch @@ -0,0 +1,20 @@ +Index: lombok-ast-0.2.3/build.xml +=================================================================== +--- lombok-ast-0.2.3.orig/build.xml ++++ lombok-ast-0.2.3/build.xml +@@ -90,6 +90,7 @@ + </target> + + <target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor."> ++ <mkdir dir="build/templateProcessor" /> + <javac destdir="build/templateProcessor" srcdir="src/template"> + <classpath refid="build.path" /> + </javac> +@@ -130,6 +131,7 @@ + <delete dir="build/lombok.ast" quiet="true" /> + <delete dir="build/lombok.ast_generatedSource" quiet="true" /> + <mkdir dir="build/lombok.ast_generatedSource" /> ++ <mkdir dir="build/lombok.ast" /> + <javac destdir="build/lombok.ast"> + <src path="src/main" /> + <src path="src/printer" /> diff --git a/debian/patches/parboiled.patch b/debian/patches/parboiled.patch new file mode 100644 index 0000000..c61f19a --- /dev/null +++ b/debian/patches/parboiled.patch @@ -0,0 +1,64 @@ +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; + + import lombok.Data; + +-import org.parboiled.BasicParseRunner; ++import org.parboiled.parserunners.BasicParseRunner; + 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; + import lombok.ast.Position; + + import org.parboiled.Context; +-import org.parboiled.RecoveringParseRunner; ++import org.parboiled.parserunners.RecoveringParseRunner; + 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; + import org.parboiled.MatcherContext; + import org.parboiled.Rule; + import org.parboiled.annotations.SuppressSubnodes; +-import org.parboiled.matchers.CharSetMatcher; ++import org.parboiled.matchers.AnyOfMatcher; + import org.parboiled.support.Characters; + + /** +@@ -106,7 +106,7 @@ public class BasicsParser extends BasePa + return new JavaIdentifierPartMatcher(); + } + +- private static class JavaIdentifierPartMatcher extends CharSetMatcher<Node> { ++ private static class JavaIdentifierPartMatcher extends AnyOfMatcher<Node> { + public JavaIdentifierPartMatcher() { + super(Characters.of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$")); + } +@@ -122,7 +122,7 @@ public class BasicsParser extends BasePa + } + } + +- private static class JavaIdentifierStartMatcher extends CharSetMatcher<Node> { ++ private static class JavaIdentifierStartMatcher extends AnyOfMatcher<Node> { + public JavaIdentifierStartMatcher() { + super(Characters.of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$")); + } +@@ -175,4 +175,4 @@ public class BasicsParser extends BasePa + public Rule lineTerminator() { + return FirstOf(String("\r\n").label("\\r\\n"), Ch('\r').label("\\r"), Ch('\n').label("\\n")); + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/remove_dependency_on_ensure-ipp.patch b/debian/patches/remove_dependency_on_ensure-ipp.patch new file mode 100644 index 0000000..dd13b32 --- /dev/null +++ b/debian/patches/remove_dependency_on_ensure-ipp.patch @@ -0,0 +1,30 @@ +Index: lombok-ast-0.2.3/build.xml +=================================================================== +--- lombok-ast-0.2.3.orig/build.xml ++++ lombok-ast-0.2.3/build.xml +@@ -65,7 +65,7 @@ + <taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" /> + </target> + +- <target name="version" depends="ensure-ipp" description="Shows the version number."> ++ <target name="version" description="Shows the version number."> + <mkdir dir="build/lombok.ast" /> + <javac destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> + <java +@@ -73,7 +73,6 @@ + classpath="build/lombok.ast" + failonerror="true" + output="build/version.txt" /> +- <ivy:loadversion property="lombok.ast.version" file="build/version.txt" /> + <echo level="info">Lombok ast version: ${lombok.ast.version}</echo> + </target> + +@@ -200,7 +199,7 @@ + <ivy:show-html file="build/cobertura/index.html" /> + </target> + +- <target name="config-ivy" depends="ensure-ipp"> ++ <target name="config-ivy"> + <ivy:configure file="buildScripts/ivysettings.xml" /> + </target> + diff --git a/debian/patches/remove_missing_dependency.patch b/debian/patches/remove_missing_dependency.patch new file mode 100644 index 0000000..4cbce6e --- /dev/null +++ b/debian/patches/remove_missing_dependency.patch @@ -0,0 +1,26 @@ +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 +@@ -7,18 +7,15 @@ + <conf name="contrib" /> + </configurations> + <dependencies> +- <dependency org="com.zwitserloot" name="cmdreader" rev="1.2" conf="build->default; runtime->default" /> ++ <dependency org="com.zwitserloot" name="com.zwitserloot.cmdreader" rev="1.2" conf="build->default; runtime->default" /> ++ <dependency org="com.github.parboiled.custom" name="parboiled-core" rev="0.9.7.2" conf="build->default; runtime->default; contrib->sources" /> + <dependency org="org.projectlombok" name="lombok" rev="0.10.8" conf="build->default" /> +- <dependency org="org.projectlombok" name="lombok-utils" rev="0.10.8" conf="runtime->default" /> +- <dependency org="com.github.parboiled.custom" name="parboiled" rev="0.9.7.2" conf="build; runtime; contrib->sources" /> + <dependency org="com.google.guava" name="guava" rev="17.0" conf="runtime->default; build->default; contrib->sources" /> + <dependency org="junit" name="junit" rev="4.8.2" conf="test->default" /> +- <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->default; contrib->sources" /> +- <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.4" conf="build->default; contrib->sources" /> ++ <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.4" conf="build->default; contrib->sources" /> + <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.4.1" conf="test->runtime" /> + <dependency org="net.sourceforge.cobertura" name="cobertura-runtime" rev="1.9.4.1" conf="test->runtime" /> + <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="build->default" /> + <dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="build->default" /> +- <dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="build" /> + </dependencies> + </ivy-module> diff --git a/debian/patches/replace_ipp_with_ivy.patch b/debian/patches/replace_ipp_with_ivy.patch new file mode 100644 index 0000000..145b7b5 --- /dev/null +++ b/debian/patches/replace_ipp_with_ivy.patch @@ -0,0 +1,91 @@ +Index: lombok-ast-0.2.3/build.xml +=================================================================== +--- lombok-ast-0.2.3.orig/build.xml ++++ lombok-ast-0.2.3/build.xml +@@ -19,13 +19,13 @@ + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + --> +-<project name="lombok.ast" default="dist" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus"> ++<project name="lombok.ast" default="dist" xmlns:ivy="antlib:org.apache.ivy.ant"> + <property name="build.compiler" value="javac1.6" /> + <property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" /> +- <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" /> ++ <available file="/usr/share/java/ivy.jar" property="ivy.available" /> + <available file="doc/jls/j3TOC.html" property="jls-available" /> + +- <target name="download-ipp" unless="ivyplusplus.available"> ++ <target name="download-ipp" unless="ivy.available"> + <mkdir dir="lib" /> + <get src="http://projectlombok.org/downloads/ivyplusplus.jar"; dest="lib/ivyplusplus.jar" usetimestamp="true" /> + </target> +@@ -67,7 +67,7 @@ + + <target name="version" depends="ensure-ipp" description="Shows the version number."> + <mkdir dir="build/lombok.ast" /> +- <ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> ++ <javac destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" /> + <java + classname="lombok.ast.Version" + classpath="build/lombok.ast" +@@ -91,9 +91,9 @@ + </target> + + <target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor."> +- <ivy:compile destdir="build/templateProcessor" srcdir="src/template"> ++ <javac destdir="build/templateProcessor" srcdir="src/template"> + <classpath refid="build.path" /> +- </ivy:compile> ++ </javac> + <mkdir dir="build/templateProcessor/META-INF" /> + <mkdir dir="build/templateProcessor/META-INF/services" /> + <echo file="build/templateProcessor/META-INF/services/javax.annotation.processing.Processor">lombok.ast.template.TemplateProcessor</echo> +@@ -102,7 +102,7 @@ + + <target name="generateSource" depends="ensureBuildDeps, templateProcessor" description="Runs just the template processor and dumps the generated sources in build/lombok.ast_generatedSource"> + <mkdir dir="build/lombok.ast_generatedSource" /> +- <ivy:compile destdir="build/lombok.ast_generatedSource"> ++ <javac destdir="build/lombok.ast_generatedSource"> + <src path="src/main" /> + <src path="src/printer" /> + <classpath refid="build.path" /> +@@ -110,7 +110,7 @@ + <compilerarg value="-proc:only" /> + <compilerarg value="-s" /> + <compilerarg path="build/lombok.ast_generatedSource" /> +- </ivy:compile> ++ </javac> + <echo>NOTE: If you see a wash of errors above this line, ignore them. Compilation succeeded; this is a javac bug.</echo> + </target> + +@@ -131,7 +131,7 @@ + <delete dir="build/lombok.ast" quiet="true" /> + <delete dir="build/lombok.ast_generatedSource" quiet="true" /> + <mkdir dir="build/lombok.ast_generatedSource" /> +- <ivy:compile destdir="build/lombok.ast"> ++ <javac destdir="build/lombok.ast"> + <src path="src/main" /> + <src path="src/printer" /> + <src path="src/javacTransformer" /> +@@ -140,7 +140,7 @@ + <classpath refid="build.path" /> + <compilerarg value="-s" /> + <compilerarg path="build/lombok.ast_generatedSource" /> +- </ivy:compile> ++ </javac> + <touch file="build/lastSuccessfulCompile" datetime="${compile.started}" pattern="yyyyMMddHHmmssSSS" /> + </target> + +@@ -168,10 +168,10 @@ + <target name="compileTests" depends="compile, ensureTestDeps" description="compiles test code"> + <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test" /> + <mkdir dir="build/tests" /> +- <ivy:compile destdir="build/tests" srcdir="test/src"> ++ <javac destdir="build/tests" srcdir="test/src"> + <classpath refid="test.path" /> + <classpath location="build/lombok.ast" /> +- </ivy:compile> ++ </javac> + </target> + + <target name="build-cobertura-instrumentation" depends="compile, ensureTestDeps"> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7349547 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +replace_ipp_with_ivy.patch +remove_dependency_on_ensure-ipp.patch +add_maven_repo.patch +remove_missing_dependency.patch +create_build_directory.patch +parboiled.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ce15cce --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#DH_VERBOSE = 1 + +# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +# main packaging script based on dh7 syntax +%: + dh $@ + +# debmake generated override targets +# This is example for Cmake (See http://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- \ +# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + + + + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 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
