[scala] 08/14: Disabled jarlister during the build (not in Debian)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository scala.

commit 3b76fe44d26c804254c73a85f048fe3de3b402a7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 30 13:46:59 2018 +0200

    Disabled jarlister during the build (not in Debian)
---
 debian/changelog                            |  1 +
 debian/patches/0013-disable-jarlister.patch | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cd2f0fa..e512907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ scala (2.11.12-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Depend on libjline2-java (>= 2.13)
     - Depend on scala-asm (>= 5.2.0-scala-2)
+    - Disabled jarlister during the build (not in Debian)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 30 Mar 2018 11:13:06 +0200
 
diff --git a/debian/patches/0013-disable-jarlister.patch b/debian/patches/0013-disable-jarlister.patch
new file mode 100644
index 0000000..db023e6
--- /dev/null
+++ b/debian/patches/0013-disable-jarlister.patch
@@ -0,0 +1,14 @@
+Description: Disables the jarlister (not in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -1262,8 +1262,6 @@
+                                   PACKED QUICK BUILD (PACK)
+ ============================================================================ -->
+   <target name="pack.lib" depends="quick.lib, forkjoin.done"> <staged-pack project="library"/>
+-    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.lib.path"/>
+-    <jarlister file="${library.jar}"/>
+   </target>
+ 
+   <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target>
diff --git a/debian/patches/series b/debian/patches/series
index 1e06d2a..29c4905 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0010-bnd-2.1.0.patch
 0011-use-local-dependencies.patch
 0012-aether-ant-tasks.patch
+0013-disable-jarlister.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git