[clojure] 03/11: Refreshed the patch

[Emmanuel Bourg]

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

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

commit b5d037319396c76b67dd9109e66d8269b0b707ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 22 15:43:49 2016 +0100

    Refreshed the patch
---
 debian/changelog                    |  1 +
 debian/patches/01-replace-asm.patch | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0419b53..5b42d45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ clojure1.8 (1.8.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Rename the package to clojure1.8
+    - Refreshed the patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 Dec 2016 15:38:43 +0100
 
diff --git a/debian/patches/01-replace-asm.patch b/debian/patches/01-replace-asm.patch
index 5f73271..cc73c0c 100644
--- a/debian/patches/01-replace-asm.patch
+++ b/debian/patches/01-replace-asm.patch
@@ -2,7 +2,7 @@ Description: Use the version of ASM in Debian
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -37,6 +37,7 @@
+@@ -40,6 +40,7 @@
    <target name="compile-java" depends="init"
            description="Compile Java sources.">
      <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
@@ -10,7 +10,7 @@ Forwarded: not-needed
             includeAntRuntime="false"
             debug="true" source="1.6" target="1.6"/>
    </target>
-@@ -44,7 +45,7 @@
+@@ -47,7 +48,7 @@
    <target name="compile-clojure"
            description="Compile Clojure sources.">
      <java classname="clojure.lang.Compile"
@@ -19,17 +19,17 @@ Forwarded: not-needed
            failonerror="true"
            fork="true">
        <sysproperty key="clojure.compile.path" value="${build}"/>
-@@ -86,7 +87,7 @@
-     <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
+@@ -92,7 +93,7 @@
             debug="true" source="1.6" target="1.6" includeantruntime="no"/>
+     <echo>Direct linking = ${directlinking}</echo>
      <java classname="clojure.lang.Compile"
 -          classpath="${test-classes}:${test}:${build}:${cljsrc}"
 +          classpath="/usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:${test-classes}:${test}:${build}:${cljsrc}"
            failonerror="true"
  	  fork="true">
        <sysproperty key="clojure.compile.path" value="${test-classes}"/>
-@@ -105,6 +106,8 @@
-     <java classname="clojure.main" failonerror="true" fork="true">
+@@ -116,6 +117,8 @@
+       <sysproperty key="clojure.compiler.direct-linking" value="${directlinking}"/>
        <classpath>
          <pathelement path="${maven.test.classpath}"/>
 +        <path location="/usr/share/java/asm.jar"/>
@@ -37,7 +37,7 @@ Forwarded: not-needed
          <path location="${test-classes}"/>
          <path location="${test}"/>
          <path location="${build}"/>
-@@ -126,7 +129,7 @@
+@@ -158,7 +161,7 @@
        </fileset>
        <manifest>
          <attribute name="Main-Class" value="clojure.main"/>
@@ -48,7 +48,7 @@ Forwarded: not-needed
      <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/>
 --- a/src/clj/clojure/core.clj
 +++ b/src/clj/clojure/core.clj
-@@ -4999,10 +4999,10 @@
+@@ -5246,10 +5246,10 @@
                     (.getAnnotation c java.lang.annotation.Retention)] 
            (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
  
@@ -61,7 +61,7 @@ Forwarded: not-needed
    (cond
     (vector? v) (let [avec (.visitArray av name)]
                   (doseq [vval v]
-@@ -5012,7 +5012,7 @@
+@@ -5259,7 +5259,7 @@
                   (cond 
                    (instance? java.lang.Enum ev)
                    (.visitEnum av name (descriptor (class ev)) (str ev))
@@ -159,7 +159,7 @@ Forwarded: not-needed
  
 --- a/test/clojure/test_clojure/reflect.clj
 +++ b/test/clojure/test_clojure/reflect.clj
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  
  (deftest field-descriptor->class-symbol-test
    (are [s d] (= s (@#'reflect/field-descriptor->class-symbol d))
@@ -170,7 +170,7 @@ Forwarded: not-needed
  
 --- a/pom.xml
 +++ b/pom.xml
-@@ -57,6 +57,16 @@
+@@ -73,6 +73,16 @@
          </exclusion>
        </exclusions>
      </dependency>

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