Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lombok

Commits:
c2721ae8 by Emmanuel Bourg at 2019-01-22T15:45:59Z
Added the missing dependency on libeclipse-jdt-core-manipulation-java (Closes: 
#918552)

- - - - -
c9085484 by Emmanuel Bourg at 2019-01-22T15:46:09Z
Standards-Version updated to 4.3.0

- - - - -
30fec3cc by Emmanuel Bourg at 2019-01-22T15:46:22Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/build.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lombok (1.16.22-6) unstable; urgency=medium
+
+  * Team upload.
+  * Added the missing dependency on libeclipse-jdt-core-manipulation-java
+    (Closes: #918552)
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <[email protected]>  Tue, 22 Jan 2019 16:46:16 +0100
+
 lombok (1.16.22-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -14,6 +14,7 @@ Build-Depends:
  ivyplusplus (>= 1.26),
  javahelper,
  libasm-java,
+ libeclipse-jdt-core-manipulation-java,
  libeclipse-jdt-ui-java,
  libjna-java,
  liblombok-patcher-java,
@@ -21,7 +22,7 @@ Build-Depends:
  libspi-java,
  maven-repo-helper,
  openjdk-8-jdk
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/lombok.git
 Vcs-Browser: https://salsa.debian.org/java-team/lombok
 Homepage: https://projectlombok.org


=====================================
debian/patches/build.patch
=====================================
@@ -3,7 +3,7 @@ Date: Wed, 3 Oct 2018 15:42:47 +0200
 Subject: build
 --- a/build.xml
 +++ b/build.xml
-@@ -37,6 +37,13 @@
+@@ -37,6 +37,14 @@
                <fileset dir="lib/build">
                        <include name="*.jar" />
                </fileset>
@@ -11,13 +11,14 @@ Subject: build
 +                      <include name="eclipse-core-runtime.jar" />
 +                      <include name="eclipse-core-resources.jar" />
 +                      <include name="eclipse-jdt-core.jar" />
++                      <include name="eclipse-jdt-core-manipulation.jar" />
 +                      <include name="eclipse-jdt-ui.jar" />
 +                      <include name="equinox-common.jar" />
 +              </fileset>
        </path>
        
        <path id="runtime.path">
-@@ -87,14 +94,14 @@
+@@ -87,14 +95,14 @@
                <fail>A new version of ivyplusplus was required and has been 
downloaded. Rerun the script to continue.</fail>
        </target>
        
@@ -34,7 +35,7 @@ Subject: build
        
        <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, ecj9" />
-@@ -117,8 +124,6 @@
+@@ -117,8 +125,6 @@
        </target>
        
        <target name="ensureRuntimeDeps" depends="config-ivy">
@@ -43,7 +44,7 @@ Subject: build
        </target>
        
        <target name="ensureTestDeps" depends="config-ivy">
-@@ -155,7 +160,7 @@
+@@ -155,7 +161,7 @@
                <echo level="info">Lombok version: ${lombok.version} 
(${lombok.fullversion})</echo>
        </target>
        
@@ -52,7 +53,7 @@ Subject: build
                <ivy:cachedunjar dest="build/lombok" 
marker="build/unpackDeps.marker">
                        <path refid="runtime.path" />
                </ivy:cachedunjar>
-@@ -176,7 +181,7 @@
+@@ -176,7 +182,7 @@
                <fail if="java.version.insufficient">To compile lombok, you 
need JDK9 or higher; lombok requires this version because it's rather difficult 
to produce lombok builds that are compatible on JDK9 without at least building 
with JDK9. Sorry about that.</fail>
        </target>
        
@@ -61,7 +62,7 @@ Subject: build
                <!-- 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.
-@@ -280,6 +285,7 @@
+@@ -280,6 +286,7 @@
                        <include name="lombok/javac/**" />
                        <include name="lombok/delombok/**" />
                        <classpath location="build/lombok" />
@@ -69,7 +70,7 @@ Subject: build
                        <classpath refid="build.path" />
                </ivy:compile>
                <delete dir="build/lombok-proc-result" quiet="true" />
-@@ -318,7 +324,7 @@
+@@ -318,7 +325,7 @@
                </ant>
        </target>
        



View it on GitLab: 
https://salsa.debian.org/java-team/lombok/compare/40813a3b32e51771a91219a6148f4e46a8b71301...30fec3cc838a545dbd94628fde483796462ce765

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/lombok/compare/40813a3b32e51771a91219a6148f4e46a8b71301...30fec3cc838a545dbd94628fde483796462ce765
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to