This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository clojure.
commit c1f15ae6390ed5c888cd34ed760fa6061ed0930a Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 22 15:15:51 2016 +0100 Renamed the asm patch and added a description --- .../{01-replace-asm => 01-replace-asm.patch} | 56 ++++++++-------------- debian/patches/series | 2 +- 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm.patch similarity index 70% rename from debian/patches/01-replace-asm rename to debian/patches/01-replace-asm.patch index 36b424c..5f73271 100644 --- a/debian/patches/01-replace-asm +++ b/debian/patches/01-replace-asm.patch @@ -1,7 +1,7 @@ -Index: pkg-clojure/build.xml -=================================================================== ---- pkg-clojure.orig/build.xml 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/build.xml 2014-06-14 11:46:43.977058066 +0900 +Description: Use the version of ASM in Debian +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml @@ -37,6 +37,7 @@ <target name="compile-java" depends="init" description="Compile Java sources."> @@ -46,10 +46,8 @@ Index: pkg-clojure/build.xml </manifest> </jar> <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/> -Index: pkg-clojure/src/clj/clojure/core.clj -=================================================================== ---- pkg-clojure.orig/src/clj/clojure/core.clj 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/clj/clojure/core.clj 2014-06-14 11:46:43.977058066 +0900 +--- a/src/clj/clojure/core.clj ++++ b/src/clj/clojure/core.clj @@ -4999,10 +4999,10 @@ (.getAnnotation c java.lang.annotation.Retention)] (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME))))) @@ -72,10 +70,8 @@ Index: pkg-clojure/src/clj/clojure/core.clj :else (throw (IllegalArgumentException. (str "Unsupported annotation value: " v " of class " (class ev)))))) (seq? v) (let [[nested nv] v -Index: pkg-clojure/src/clj/clojure/core_proxy.clj -=================================================================== ---- pkg-clojure.orig/src/clj/clojure/core_proxy.clj 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/clj/clojure/core_proxy.clj 2014-06-14 11:46:43.977058066 +0900 +--- a/src/clj/clojure/core_proxy.clj ++++ b/src/clj/clojure/core_proxy.clj @@ -11,9 +11,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -88,10 +84,8 @@ Index: pkg-clojure/src/clj/clojure/core_proxy.clj '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT)) (defn method-sig [^java.lang.reflect.Method meth] -Index: pkg-clojure/src/clj/clojure/genclass.clj -=================================================================== ---- pkg-clojure.orig/src/clj/clojure/genclass.clj 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/clj/clojure/genclass.clj 2014-06-14 11:46:43.977058066 +0900 +--- a/src/clj/clojure/genclass.clj ++++ b/src/clj/clojure/genclass.clj @@ -9,8 +9,8 @@ (in-ns 'clojure.core) @@ -103,10 +97,8 @@ Index: pkg-clojure/src/clj/clojure/genclass.clj '(clojure.lang IPersistentMap)) ;(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 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2014-06-14 11:46:43.981057707 +0900 +--- a/src/jvm/clojure/lang/Compiler.java ++++ b/src/jvm/clojure/lang/Compiler.java @@ -12,11 +12,13 @@ package clojure.lang; @@ -143,10 +135,8 @@ Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java public class Compiler implements Opcodes{ -Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java -=================================================================== ---- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2014-06-14 11:46:43.981057707 +0900 +--- a/src/jvm/clojure/lang/Intrinsics.java ++++ b/src/jvm/clojure/lang/Intrinsics.java @@ -12,7 +12,7 @@ package clojure.lang; @@ -156,10 +146,8 @@ Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java public class Intrinsics implements Opcodes{ private static Object[] oa(Object... arr){ -Index: pkg-clojure/src/clj/clojure/reflect/java.clj -=================================================================== ---- pkg-clojure.orig/src/clj/clojure/reflect/java.clj 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/src/clj/clojure/reflect/java.clj 2014-06-14 11:46:43.981057707 +0900 +--- a/src/clj/clojure/reflect/java.clj ++++ b/src/clj/clojure/reflect/java.clj @@ -11,7 +11,7 @@ (require '[clojure.set :as set] @@ -169,10 +157,8 @@ Index: pkg-clojure/src/clj/clojure/reflect/java.clj '[java.lang.reflect Modifier] java.io.InputStream) -Index: pkg-clojure/test/clojure/test_clojure/reflect.clj -=================================================================== ---- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/test/clojure/test_clojure/reflect.clj 2014-06-14 11:46:43.981057707 +0900 +--- a/test/clojure/test_clojure/reflect.clj ++++ b/test/clojure/test_clojure/reflect.clj @@ -25,7 +25,7 @@ (deftest field-descriptor->class-symbol-test @@ -182,10 +168,8 @@ 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 2014-06-14 11:46:43.985057347 +0900 -+++ pkg-clojure/pom.xml 2014-06-14 11:58:10.342650895 +0900 +--- a/pom.xml ++++ b/pom.xml @@ -57,6 +57,16 @@ </exclusion> </exclusions> diff --git a/debian/patches/series b/debian/patches/series index f124f89..63dcdee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -01-replace-asm +01-replace-asm.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/clojure.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
