[clojure] 07/09: Added the missing .patch extension to 01-replace-asm

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri May 2 16:20:11 UTC 2014


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

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

commit 519fcf46c550728d71be8b2d801d6064c86ffc82
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 2 18:06:51 2014 +0200

    Added the missing .patch extension to 01-replace-asm
---
 .../{01-replace-asm => 01-replace-asm.patch}       | 30 ++++++++--------------
 debian/patches/series                              |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm.patch
similarity index 79%
rename from debian/patches/01-replace-asm
rename to debian/patches/01-replace-asm.patch
index fca7ece..8d793de 100644
--- a/debian/patches/01-replace-asm
+++ b/debian/patches/01-replace-asm.patch
@@ -1,7 +1,5 @@
-Index: pkg-clojure/build.xml
-===================================================================
---- pkg-clojure.orig/build.xml	2011-06-14 18:44:29.447220034 +0900
-+++ pkg-clojure/build.xml	2011-06-14 18:44:57.235013081 +0900
+--- a/build.xml
++++ b/build.xml
 @@ -87,13 +87,14 @@
    <target name="compile-java" depends="init"
            description="Compile Java sources.">
@@ -62,10 +60,8 @@ Index: pkg-clojure/build.xml
        </manifest>
      </jar>
      <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />
-Index: pkg-clojure/src/clj/clojure/core.clj
-===================================================================
---- pkg-clojure.orig/src/clj/clojure/core.clj	2011-06-14 18:44:29.411349438 +0900
-+++ pkg-clojure/src/clj/clojure/core.clj	2011-06-14 18:44:40.247125627 +0900
+--- a/src/clj/clojure/core.clj
++++ b/src/clj/clojure/core.clj
 @@ -4299,10 +4299,10 @@
                     (.getAnnotation c java.lang.annotation.Retention)] 
            (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
@@ -88,10 +84,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	2011-06-14 18:44:29.435199626 +0900
-+++ pkg-clojure/src/clj/clojure/core_proxy.clj	2011-06-14 18:44:40.247125627 +0900
+--- a/src/clj/clojure/core_proxy.clj
++++ b/src/clj/clojure/core_proxy.clj
 @@ -11,9 +11,9 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -104,10 +98,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	2011-06-14 18:44:29.423466929 +0900
-+++ pkg-clojure/src/clj/clojure/genclass.clj	2011-06-14 18:44:40.247125627 +0900
+--- a/src/clj/clojure/genclass.clj
++++ b/src/clj/clojure/genclass.clj
 @@ -9,8 +9,8 @@
  (in-ns 'clojure.core)
  
@@ -119,10 +111,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	2011-06-14 18:44:29.403372045 +0900
-+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java	2011-06-14 18:44:40.247125627 +0900
+--- a/src/jvm/clojure/lang/Compiler.java
++++ b/src/jvm/clojure/lang/Compiler.java
 @@ -12,17 +12,18 @@
  
  package clojure.lang;
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



More information about the pkg-java-commits mailing list