[SCM] UNNAMED PROJECT branch, master, updated. debian/1.4.0+dfsg-1

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 172ef860aad7ec775a8c6d78f1c1f8fc8a3cb866
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sat Apr 21 11:28:49 2012 +0900

    Updated debian/patches/01-replace-asm.

diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm
index 033127e..f5af6bb 100644
--- a/debian/patches/01-replace-asm
+++ b/debian/patches/01-replace-asm
@@ -1,15 +1,16 @@
 Index: pkg-clojure/build.xml
 ===================================================================
---- pkg-clojure.orig/build.xml	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/build.xml	2011-09-25 13:51:59.000000000 +0900
-@@ -36,13 +36,14 @@
+--- pkg-clojure.orig/build.xml	2012-04-21 11:11:53.000000000 +0900
++++ pkg-clojure/build.xml	2012-04-21 11:25:02.000000000 +0900
+@@ -36,6 +36,7 @@
    <target name="compile-java" depends="init"
            description="Compile Java sources.">
      <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
 +           classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
-            debug="true" target="1.5"/>
+            includeAntRuntime="false"
+            debug="true" source="1.5" target="1.5"/>
    </target>
- 
+@@ -43,7 +44,7 @@
    <target name="compile-clojure"
            description="Compile Clojure sources.">
      <java classname="clojure.lang.Compile"
@@ -18,16 +19,16 @@ Index: pkg-clojure/build.xml
            failonerror="true"
            fork="true">
        <sysproperty key="clojure.compile.path" value="${build}"/>
-@@ -81,7 +82,7 @@
-     <!-- <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes" -->
-     <!--        debug="true" target="1.5" includeantruntime="no"/> -->
+@@ -83,7 +84,7 @@
+     <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
+            debug="true" source="1.5" target="1.5" includeantruntime="no"/>
      <java classname="clojure.lang.Compile"
 -          classpath="${test-classes}:${test}:${build}:${cljsrc}"
 +          classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${test-classes}:${test}:${build}:${cljsrc}"
            failonerror="true"
  	  fork="true">
        <sysproperty key="clojure.compile.path" value="${test-classes}"/>
-@@ -96,6 +97,8 @@
+@@ -100,6 +101,8 @@
            unless="maven.test.skip">
      <java classname="clojure.main" failonerror="true" fork="true">
        <classpath>
@@ -36,7 +37,7 @@ Index: pkg-clojure/build.xml
          <path location="${test-classes}"/>
          <path location="${test}"/>
          <path location="${build}"/>
-@@ -117,7 +120,7 @@
+@@ -121,7 +124,7 @@
        </fileset>
        <manifest>
          <attribute name="Main-Class" value="clojure.main"/>
@@ -47,9 +48,9 @@ Index: pkg-clojure/build.xml
      <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/>
 Index: pkg-clojure/src/clj/clojure/core.clj
 ===================================================================
---- pkg-clojure.orig/src/clj/clojure/core.clj	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/clj/clojure/core.clj	2011-09-25 13:51:45.000000000 +0900
-@@ -4759,10 +4759,10 @@
+--- pkg-clojure.orig/src/clj/clojure/core.clj	2012-04-21 11:11:53.000000000 +0900
++++ pkg-clojure/src/clj/clojure/core.clj	2012-04-21 11:22:56.000000000 +0900
+@@ -4786,10 +4786,10 @@
                     (.getAnnotation c java.lang.annotation.Retention)] 
            (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
  
@@ -62,7 +63,7 @@ Index: pkg-clojure/src/clj/clojure/core.clj
    (cond
     (vector? v) (let [avec (.visitArray av name)]
                   (doseq [vval v]
-@@ -4772,7 +4772,7 @@
+@@ -4799,7 +4799,7 @@
                   (cond 
                    (instance? java.lang.Enum ev)
                    (.visitEnum av name (descriptor (class ev)) (str ev))
@@ -73,8 +74,8 @@ Index: pkg-clojure/src/clj/clojure/core.clj
     (seq? v) (let [[nested nv] v
 Index: pkg-clojure/src/clj/clojure/core_proxy.clj
 ===================================================================
---- pkg-clojure.orig/src/clj/clojure/core_proxy.clj	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/clj/clojure/core_proxy.clj	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/src/clj/clojure/core_proxy.clj	2012-04-21 11:10:54.000000000 +0900
++++ pkg-clojure/src/clj/clojure/core_proxy.clj	2012-04-21 11:22:56.000000000 +0900
 @@ -11,9 +11,9 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -89,8 +90,8 @@ Index: pkg-clojure/src/clj/clojure/core_proxy.clj
  (defn method-sig [^java.lang.reflect.Method meth]
 Index: pkg-clojure/src/clj/clojure/genclass.clj
 ===================================================================
---- pkg-clojure.orig/src/clj/clojure/genclass.clj	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/clj/clojure/genclass.clj	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/src/clj/clojure/genclass.clj	2012-04-21 11:11:53.000000000 +0900
++++ pkg-clojure/src/clj/clojure/genclass.clj	2012-04-21 11:22:56.000000000 +0900
 @@ -9,8 +9,8 @@
  (in-ns 'clojure.core)
  
@@ -104,8 +105,8 @@ Index: pkg-clojure/src/clj/clojure/genclass.clj
  ;(defn method-sig [^java.lang.reflect.Method meth]
 Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
 ===================================================================
---- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java	2012-04-21 11:11:53.000000000 +0900
++++ pkg-clojure/src/jvm/clojure/lang/Compiler.java	2012-04-21 11:22:56.000000000 +0900
 @@ -12,12 +12,14 @@
  
  package clojure.lang;
@@ -142,8 +143,8 @@ Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
  
 Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java
 ===================================================================
---- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java	2012-04-21 11:10:54.000000000 +0900
++++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java	2012-04-21 11:22:56.000000000 +0900
 @@ -12,7 +12,7 @@
  
  package clojure.lang;
@@ -155,8 +156,8 @@ Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java
  private static Object[] oa(Object... arr){
 Index: pkg-clojure/src/clj/clojure/reflect/java.clj
 ===================================================================
---- pkg-clojure.orig/src/clj/clojure/reflect/java.clj	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/src/clj/clojure/reflect/java.clj	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/src/clj/clojure/reflect/java.clj	2012-04-21 11:10:54.000000000 +0900
++++ pkg-clojure/src/clj/clojure/reflect/java.clj	2012-04-21 11:22:56.000000000 +0900
 @@ -11,7 +11,7 @@
  
  (require '[clojure.set :as set]
@@ -168,8 +169,8 @@ Index: pkg-clojure/src/clj/clojure/reflect/java.clj
  
 Index: pkg-clojure/test/clojure/test_clojure/reflect.clj
 ===================================================================
---- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj	2011-09-25 13:51:38.000000000 +0900
-+++ pkg-clojure/test/clojure/test_clojure/reflect.clj	2011-09-25 13:51:45.000000000 +0900
+--- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj	2012-04-21 11:10:54.000000000 +0900
++++ pkg-clojure/test/clojure/test_clojure/reflect.clj	2012-04-21 11:22:56.000000000 +0900
 @@ -24,7 +24,7 @@
  
  (deftest field-descriptor->class-symbol-test

-- 
UNNAMED PROJECT