The following commit has been merged in the master branch: commit c03c60ae16c8dd40d3ce6a7352d9ea9f99ebd400 Author: Daigo Moriwaki <da...@debian.org> Date: Sat May 19 20:09:54 2012 +0900
debian/patches/01-replace-asm: now depends on asm and asm-commons. diff --git a/debian/changelog b/debian/changelog index e2274df..791e2ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +clojure1.4 (1.4.0+dfsg-2) unstable; urgency=low + + * debian/patches/01-replace-asm: now depends on asm and asm-commons. + + -- Daigo Moriwaki <da...@debian.org> Sat, 19 May 2012 20:08:56 +0900 + clojure1.4 (1.4.0+dfsg-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm index f5af6bb..887128a 100644 --- a/debian/patches/01-replace-asm +++ b/debian/patches/01-replace-asm @@ -1,7 +1,7 @@ Index: pkg-clojure/build.xml =================================================================== ---- 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 +--- pkg-clojure.orig/build.xml 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/build.xml 2012-05-19 20:07:47.000000000 +0900 @@ -36,6 +36,7 @@ <target name="compile-java" depends="init" description="Compile Java sources."> @@ -48,8 +48,8 @@ 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 2012-04-21 11:11:53.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/core.clj 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/clj/clojure/core.clj 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/clj/clojure/core.clj 2012-05-19 20:07:47.000000000 +0900 @@ -4786,10 +4786,10 @@ (.getAnnotation c java.lang.annotation.Retention)] (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME))))) @@ -74,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 2012-04-21 11:10:54.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/core_proxy.clj 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/clj/clojure/core_proxy.clj 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/clj/clojure/core_proxy.clj 2012-05-19 20:07:47.000000000 +0900 @@ -11,9 +11,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -90,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 2012-04-21 11:11:53.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/genclass.clj 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/clj/clojure/genclass.clj 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/clj/clojure/genclass.clj 2012-05-19 20:07:47.000000000 +0900 @@ -9,8 +9,8 @@ (in-ns 'clojure.core) @@ -105,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 2012-04-21 11:11:53.000000000 +0900 -+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2012-05-19 20:07:47.000000000 +0900 @@ -12,12 +12,14 @@ package clojure.lang; @@ -143,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 2012-04-21 11:10:54.000000000 +0900 -+++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2012-05-19 20:07:47.000000000 +0900 @@ -12,7 +12,7 @@ package clojure.lang; @@ -156,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 2012-04-21 11:10:54.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/reflect/java.clj 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/src/clj/clojure/reflect/java.clj 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/src/clj/clojure/reflect/java.clj 2012-05-19 20:07:47.000000000 +0900 @@ -11,7 +11,7 @@ (require '[clojure.set :as set] @@ -169,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 2012-04-21 11:10:54.000000000 +0900 -+++ pkg-clojure/test/clojure/test_clojure/reflect.clj 2012-04-21 11:22:56.000000000 +0900 +--- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj 2012-05-19 20:06:17.000000000 +0900 ++++ pkg-clojure/test/clojure/test_clojure/reflect.clj 2012-05-19 20:07:47.000000000 +0900 @@ -24,7 +24,7 @@ (deftest field-descriptor->class-symbol-test @@ -180,3 +180,24 @@ Index: pkg-clojure/test/clojure/test_clojure/reflect.clj 'int "I" 'java.lang.Object "Ljava.lang.Object;")) +Index: pkg-clojure/pom.xml +=================================================================== +--- pkg-clojure.orig/pom.xml 2012-05-19 20:07:42.000000000 +0900 ++++ pkg-clojure/pom.xml 2012-05-19 20:08:09.000000000 +0900 +@@ -209,4 +209,16 @@ + </build> + </profile> + </profiles> ++ <dependencies> ++ <dependency> ++ <groupId>asm</groupId> ++ <artifactId>asm</artifactId> ++ <version>3.x</version> ++ </dependency> ++ <dependency> ++ <groupId>asm</groupId> ++ <artifactId>asm-commons</artifactId> ++ <version>3.x</version> ++ </dependency> ++ </dependencies> + </project> -- UNNAMED PROJECT _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits