This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository lombok.
commit fa54e5808849bd4a383128ba6e0b54bc6867e21b Merge: 28d5245 ff247b8 Author: Markus Koschany <[email protected]> Date: Sun Feb 14 22:19:02 2016 +0100 Imported Debian patch 1.16.6+ds-1 debian/.gitignore | 8 - debian/build.xml | 198 ------------ debian/changelog | 31 +- debian/control | 15 +- debian/copyright | 14 +- debian/gbp.conf | 3 - debian/install | 2 - debian/liblombok-java-doc.install | 1 + debian/liblombok-java-doc.javadoc | 1 - debian/liblombok-java.jlibs | 3 +- debian/liblombok-java.poms | 2 + debian/linkjars | 3 + debian/links | 2 - debian/lombok-maven-1.16.6.1.pom | 351 --------------------- debian/lombok-pom.xml | 46 +++ debian/lombok-utils.pom.xml | 46 +++ debian/patches/Javac.patch | 67 ++++ debian/patches/add_maven_repo.patch | 20 -- debian/patches/build.patch | 75 +++++ ...clude_classes_that_require_lombok_patcher.patch | 59 ---- .../include_jars_from_debian_in_build_path.patch | 60 ---- debian/patches/javadoc.patch | 34 ++ .../patches/remove_dependency_on_ensure-ipp.patch | 27 -- debian/patches/series | 7 +- debian/rules | 30 +- debian/watch | 3 +- .../lombok/installer/WindowsDriveInfo-i386.dll | Bin 14472 -> 0 bytes .../lombok/installer/WindowsDriveInfo-x86_64.dll | Bin 66806 -> 0 bytes 28 files changed, 330 insertions(+), 778 deletions(-) diff --cc debian/changelog index 44ece97,0000000..04da7de mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,0 +1,34 @@@ - lombok (1.16.6-2) UNRELEASED; urgency=medium - - * Team upload - * Fix watch file - * Download - https://repo1.maven.org/maven2/org/projectlombok/lombok-maven/1.16.6.1/lombok-maven-1.16.6.1.pom - and install it via mh_installpom in debian/rules - - -- Andreas Tille <[email protected]> Fri, 29 Jan 2016 09:09:51 +0100 ++lombok (1.16.6+ds-1) UNRELEASED; urgency=medium ++ ++ * Team upload. ++ * Add javac.patch and fix compilation error with OpenJDK 8. (Closes: #814764) ++ * Add build.patch. Use upstream's build.xml file but prevent the build system ++ from downloading anything from the web. ++ * Drop debian/build-xml. ++ * Add javadoc.patch and fix compilation error when building the ++ dcoumentation. Thus the -doc package will not be empty anymore. ++ * Replace liblombok-java-doc.javadoc with liblombok-java-doc.install. ++ * Remove debian/links file. ++ * Fix debian/watch and do not use githubredir anymore. It is obsolete. ++ * Simplify get-orig-source target and use Files-Excluded mechanism. ++ * Repack the tarball and remove superfluous dll files. ++ * Update the package description of liblombok-java because the package is ++ complete now. ++ * Add ivypluspplus and liblombok-patcher-java to Build-Depends. ++ * Ensure that cmdreader, lombok-patcher and ASM are injected into lombok.jar. ++ * Install maven artifacts into local maven-repo. Build with ++ maven_repo_helper. ++ ++ -- Markus Koschany <[email protected]> Sun, 14 Feb 2016 22:19:02 +0100 + +lombok (1.16.6-1) unstable; urgency=low + + * Initial release. (Closes: #807816) + + -- Hans-Christoph Steiner <[email protected]> Sun, 13 Dec 2015 23:23:23 +0100 + +lombok (0.11.6-1) UNRELEASED; urgency=low + + * Initial work + + -- Jakub Adam <[email protected]> Fri, 02 Nov 2012 21:28:02 +0100 diff --cc debian/control index ac2fb10,0000000..4b3c518 mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,55 -1,0 +1,54 @@@ +Source: lombok +Section: java - Priority: extra ++Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Jakub Adam <[email protected]>, + Komal Sukhani <[email protected]> +Build-Depends: ant, + ant-optional, + cmdreader, + debhelper (>= 9~), + default-jdk, + eclipse-jdt, + eclipse-platform-data, + ivy, + ivyplusplus, - libasm3-java, ++ javahelper, ++ libasm4-java, + libjna-java, - libspi-java - Standards-Version: 3.9.6 ++ liblombok-patcher-java, ++ libspi-java, ++ maven-repo-helper ++Standards-Version: 3.9.7 +Homepage: https://projectlombok.org +Vcs-Git: https://anonscm.debian.org/git/pkg-java/lombok.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/lombok.git + +Package: liblombok-java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Description: Reduce boilerplate code in Java projects + "Boilerplate" is a term used to describe code that is repeated in + many parts of an application with little alteration. One of the most + frequently voiced criticisms of the Java language is the volume of + this type of code that is found in most projects. This problem is + frequently a result of design decisions in various libraries, but is + exacerbated by limitations in the language itself. Project Lombok + aims to reduce the prevalence of some of the worst offenders by + replacing them with a simple set of annotations. - . - Note: this package currently does not include all of the Lombok - classes, it has only enough to get lombok.ast working, and whatever - else was easy to include. + +Package: liblombok-java-doc +Architecture: all +Section: doc +Depends: ${java:Depends}, ${misc:Depends} +Description: Reduce boilerplate code in Java projects (documentation) + "Boilerplate" is a term used to describe code that is repeated in + many parts of an application with little alteration. One of the most + frequently voiced criticisms of the Java language is the volume of + this type of code that is found in most projects. This problem is + frequently a result of design decisions in various libraries, but is + exacerbated by limitations in the language itself. Project Lombok + aims to reduce the prevalence of some of the worst offenders by + replacing them with a simple set of annotations. + . + This package contains the generated API documentation. diff --cc debian/copyright index e4714dc,0000000..bd80be0 mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,60 -1,0 +1,62 @@@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lombok +Source: https://github.com/rzwitserloot/lombok ++Files-Excluded: ++ lombok*/website/* ++ *.dll ++ ++Files: * ++Copyright: 2009-2015 The Project Lombok Authors. ++License: MIT + +Files: debian/* +Copyright: 2015, Hans-Christoph Steiner <[email protected]> - 2012-2013, Jakub Adam <[email protected]> ++ 2012-2013, Jakub Adam <[email protected]> +License: MIT + +Files: src/delombok/lombok/delombok/PrettyCommentsPrinter.java +Copyright: 1999-2006 Sun Microsystems, Inc. +License: GPL-2-only + - Files: * - Copyright: 2009-2015 The Project Lombok Authors. - License: MIT - - +License: GPL-2-only + This code is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License version 2 only, as + published by the Free Software Foundation. Sun designates this + particular file as subject to the "Classpath" exception as provided + by Sun in the LICENSE file that accompanied this code. + . + This code 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 + version 2 for more details (a copy is included in the LICENSE file that + accompanied this code). + . + You should have received a copy of the GNU General Public License version + 2 along with this work; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + . + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + CA 95054 USA or visit www.sun.com if you need additional information or + have any questions. + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. diff --cc debian/liblombok-java-doc.install index 0000000,0000000..c4215d7 new file mode 100644 --- /dev/null +++ b/debian/liblombok-java-doc.install @@@ -1,0 -1,0 +1,1 @@@ ++doc/api usr/share/doc/liblombok-java-doc diff --cc debian/liblombok-java.jlibs index 52899c9,0000000..abdabb5 mode 100644,000000..100644 --- a/debian/liblombok-java.jlibs +++ b/debian/liblombok-java.jlibs @@@ -1,1 -1,0 +1,2 @@@ - lombok.jar ++dist/lombok.jar ++dist/lombok-utils.jar diff --cc debian/liblombok-java.poms index 0000000,0000000..27b07b7 new file mode 100644 --- /dev/null +++ b/debian/liblombok-java.poms @@@ -1,0 -1,0 +1,2 @@@ ++debian/lombok-pom.xml --has-package-version --artifact=dist/lombok.jar ++debian/lombok-utils.pom.xml --has-package-version --artifact=dist/lombok-utils.jar diff --cc debian/linkjars index 0000000,0000000..45da4ca new file mode 100644 --- /dev/null +++ b/debian/linkjars @@@ -1,0 -1,0 +1,3 @@@ ++lib ++lib/build ++lib/runtime diff --cc debian/lombok-pom.xml index 0000000,0000000..84976f7 new file mode 100644 --- /dev/null +++ b/debian/lombok-pom.xml @@@ -1,0 -1,0 +1,46 @@@ ++<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.projectlombok</groupId> ++ <artifactId>lombok</artifactId> ++ <packaging>jar</packaging> ++ <version>1.16.6</version> ++ <name>Project Lombok</name> ++ <url>https://projectlombok.org</url> ++ <description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description> ++ <dependencies/> ++ <licenses> ++ <license> ++ <name>The MIT License</name> ++ <url>https://projectlombok.org/LICENSE</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ <scm> ++ <connection>scm:git:git://github.com/rzwitserloot/lombok.git</connection> ++ <url>http://github.com/rzwitserloot/lombok</url> ++ </scm> ++ <issueManagement> ++ <system>Google Code</system> ++ <url>http://code.google.com/p/projectlombok/issues</url> ++ </issueManagement> ++ <developers> ++ <developer> ++ <id>rzwitserloot</id> ++ <name>Reinier Zwitserloot</name> ++ <email>[email protected]</email> ++ <url>http://zwitserloot.com</url> ++ <timezone>+1</timezone> ++ </developer> ++ <developer> ++ <id>rspilker</id> ++ <name>Roel Spilker</name> ++ <email>[email protected]</email> ++ <timezone>+1</timezone> ++ </developer> ++ <developer> ++ <id>rgrootjans</id> ++ <name>Robbert Jan Grootjans</name> ++ <timezone>+1</timezone> ++ </developer> ++ </developers> ++</project> diff --cc debian/lombok-utils.pom.xml index 0000000,0000000..68c7419 new file mode 100644 --- /dev/null +++ b/debian/lombok-utils.pom.xml @@@ -1,0 -1,0 +1,46 @@@ ++<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.projectlombok</groupId> ++ <artifactId>lombok-utils</artifactId> ++ <packaging>jar</packaging> ++ <version>1.16.6</version> ++ <name>Project Lombok</name> ++ <url>https://projectlombok.org</url> ++ <description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description> ++ <dependencies/> ++ <licenses> ++ <license> ++ <name>The MIT License</name> ++ <url>https://projectlombok.org/LICENSE</url> ++ <distribution>repo</distribution> ++ </license> ++ </licenses> ++ <scm> ++ <connection>scm:git:git://github.com/rzwitserloot/lombok.git</connection> ++ <url>http://github.com/rzwitserloot/lombok</url> ++ </scm> ++ <issueManagement> ++ <system>Google Code</system> ++ <url>http://code.google.com/p/projectlombok/issues</url> ++ </issueManagement> ++ <developers> ++ <developer> ++ <id>rzwitserloot</id> ++ <name>Reinier Zwitserloot</name> ++ <email>[email protected]</email> ++ <url>http://zwitserloot.com</url> ++ <timezone>+1</timezone> ++ </developer> ++ <developer> ++ <id>rspilker</id> ++ <name>Roel Spilker</name> ++ <email>[email protected]</email> ++ <timezone>+1</timezone> ++ </developer> ++ <developer> ++ <id>rgrootjans</id> ++ <name>Robbert Jan Grootjans</name> ++ <timezone>+1</timezone> ++ </developer> ++ </developers> ++</project> diff --cc debian/patches/Javac.patch index 0000000,0000000..d7c029f new file mode 100644 --- /dev/null +++ b/debian/patches/Javac.patch @@@ -1,0 -1,0 +1,67 @@@ ++From: Markus Koschany <[email protected]> ++Date: Sat, 13 Feb 2016 21:55:08 +0100 ++Subject: Javac ++ ++Fix compilation error with OpenJDK 8. ++ ++Forwarded: no ++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; ++ ++ import com.sun.tools.javac.code.Source; ++ 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; ++ import com.sun.tools.javac.tree.JCTree.JCLiteral; ++ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; ++ +++import java.lang.UnsupportedOperationException; +++ ++ /** ++ * 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) { ++ 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 { ++ } ++ ++ private static class JCNoType extends Type implements NoType { ++- public JCNoType(int tag) { ++- super(tag, null); +++ public JCNoType(TypeSymbol tag) { +++ super(tag); ++ } ++- +++ @Override +++ public com.sun.tools.javac.code.TypeTag getTag(){ +++ throw new UnsupportedOperationException(); +++ } +++ ++ @Override ++ public TypeKind getKind() { ++- if (tag == ((Integer) CTC_VOID.value).intValue()) return TypeKind.VOID; ++- if (tag == ((Integer) CTC_NONE.value).intValue()) return TypeKind.NONE; +++ TypeSymbol tag = null; +++ if (tag == CTC_VOID.value) return TypeKind.VOID; +++ if (tag == CTC_NONE.value) return TypeKind.NONE; ++ throw new AssertionError("Unexpected tag: " + tag); ++ } ++ diff --cc debian/patches/build.patch index 0000000,0000000..f861c8b new file mode 100644 --- /dev/null +++ b/debian/patches/build.patch @@@ -1,0 -1,0 +1,75 @@@ ++From: Markus Koschany <[email protected]> ++Date: Sat, 13 Feb 2016 20:59:19 +0100 ++Subject: build ++ ++Ensure that nothing gets downloaded from the web and make all ++build-dependencies available in lib/build. ++ ++Forwarded: not-needed ++--- ++ build.xml | 22 +++++++++++++++++----- ++ 1 file changed, 17 insertions(+), 5 deletions(-) ++ ++diff --git a/build.xml b/build.xml ++index e157632..ad8118c 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 ++ <fileset dir="lib/build"> ++ <include name="*.jar" /> ++ </fileset> +++ <fileset dir="/usr/share/eclipse/dropins/jdt/plugins/"> +++ <include name="*.jar" /> +++ </fileset> +++ <fileset dir="/usr/share/eclipse/plugins/"> +++ <include name="*.jar" /> +++ </fileset> +++ <fileset dir="/usr/lib/eclipse/plugins/"> +++ <include name="*.jar" /> +++ </fileset> +++ <fileset dir="/usr/lib/jvm/java-8-openjdk-amd64/lib/"> +++ <include name="*.jar" /> +++ </fileset> ++ </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 ++ ++ <target name="ensure-ipp" depends="load-ipp, redownload-ipp" /> ++ ++- <target name="config-ivy" depends="ensure-ipp" unless="ivy.config"> +++ <target name="config-ivy" depends="" unless="ivy.config"> ++ <ivy:configure file="buildScripts/ivysettings.xml" /> ++ <property name="ivy.config" value="true" /> ++ </target> ++ ++- <target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." /> +++ <target name="deps" depends="" description="Do not download anything." /> ++ ++ <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 ++ <ivy:retrieve /> ++ </target> ++ ++- <target name="version" depends="ensure-ipp" description="Shows the version number." unless="lombok.version"> +++ <target name="version" depends="" description="Shows the version number." unless="lombok.version"> ++ <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> ++ </target> ++ ++- <target name="-unpackLibs" depends="ensureRuntimeDeps"> +++ <target name="-unpackLibs" depends=""> ++ <ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker"> ++ <path refid="runtime.path" /> ++ </ivy:cachedunjar> ++ </target> ++ ++- <target name="compile" depends="version, ensureBuildDeps, -unpackLibs" description="Compiles the code."> +++ <target name="compile" depends="version, -unpackLibs" description="Compiles the code."> ++ <!-- ant includes the destination dir on the classpath (and there are good reasons to do this), but that also means ++ the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile ++ anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running. diff --cc debian/patches/javadoc.patch index 0000000,0000000..7ec36b0 new file mode 100644 --- /dev/null +++ b/debian/patches/javadoc.patch @@@ -1,0 -1,0 +1,34 @@@ ++From: Markus Koschany <[email protected]> ++Date: Mon, 15 Feb 2016 16:58:02 +0100 ++Subject: javadoc ++ ++Fix compilation error when building the javadoc. Those classes are not ++available. ++ ++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..26c2707 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. ++ </tar> ++ </target> ++ ++- <taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" /> ++- <taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" /> ++ <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. ++ 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" 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/"; /> diff --cc debian/patches/series index cadb832,0000000..1033595 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,0 +1,3 @@@ - remove_dependency_on_ensure-ipp.patch - add_maven_repo.patch - include_jars_from_debian_in_build_path.patch - exclude_classes_that_require_lombok_patcher.patch ++build.patch ++Javac.patch ++javadoc.patch diff --cc debian/rules index c50dbc8,0000000..629e142 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,33 -1,0 +1,27 @@@ +#!/usr/bin/make -f + +include /usr/share/dpkg/default.mk - +export JAVA_HOME=/usr/lib/jvm/default-java + +%: - dh $@ ++ dh $@ --parallel --with javahelper,maven_repo_helper + +override_dh_auto_clean: + dh_auto_clean - ant -lib /usr/share/java/ivyplusplus.jar clean ++ ant -Dbasedir=$(CURDIR) clean + +override_dh_auto_build: + echo lombok.version=$(DEB_VERSION_UPSTREAM) > debian/lombok.version.properties - ant -lib /usr/share/java/ivyplusplus.jar dist dist-utils ++ ant -Dbasedir=$(CURDIR) dist dist-utils ++ ant \ ++ -Dbasedir=$(CURDIR) \ ++ -buildfile buildScripts/website.ant.xml \ ++ -Dlombok.version=$(DEB_VERSION_UPSTREAM) \ ++ javadoc + - override_dh_link: - dh_link - mh_installjar - mh_installpom ++override_jh_linkjars: ++ jh_linkjars ++ $(RM) lib/runtime/ant* lib/runtime/ivy* lib/runtime/jdi* lib/runtime/jna* lib/runtime/spi* + - newtarball = new$(DEB_VERSION_UPSTREAM).tar.gz +get-orig-source: - wget --continue -O $(newtarball) \ - https://github.com/rzwitserloot/lombok/archive/v$(DEB_VERSION_UPSTREAM).tar.gz - mk-origtargz \ - --rename \ - --repack \ - --exclude-file 'lombok*/website/*' \ - --exclude-file '*.dll' \ - --compression xz \ - $(newtarball) ++ uscan --download-current-version --force-download --repack --compression xz diff --cc debian/watch index a372eda,0000000..fc7897e mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,2 -1,0 +1,3 @@@ +version=3 - https://github.com/rzwitserloot/lombok/releases .*/archive/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) ++opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/lombok-$1\.tar\.gz/,repacksuffix=+ds \ ++ https://github.com/rzwitserloot/lombok/tags .*/v?(\d\S*)\.tar\.gz -- 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
