← Back to branch summary

~ubuntu-branches/ubuntu/quantal/clojure/quantal

« back to all changes in this revision

Viewing changes to debian/patches/01-system-asm.patch

  • Committer: Bazaar Package Importer
  • Author(s): Peter Collingbourne
  • Date: 2009-05-07 15:09:44 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090507150944-5bz9giyi356u0st6
Tags: 1.0.0+dfsg-1
* New upstream release.
* debian/rules, debian/watch: s/.dfsg/+dfsg/; changes required to deal
  with new version numbering scheme and source code layout
* debian/install, debian/rules: version the clojure.jar file
* debian/copyright: updated
* debian/patches/01-system-asm.patch, debian/scripts/clojure,
  debian/scripts/clojurec, debian/scripts/clojure-repl,
  debian/README.Debian: add a Class-Path attribute to clojure.jar to
  automatically bring in asm3 and asm3-commons deps
* debian/clojure-repl.1, debian/clojure.1, debian/clojurec.1,
  debian/scripts/clojure: clojure script now uses clojure.main.
  Rewrote man page and deprecated clojure-repl which provides the same
  functionality
* debian/control: s/svn+ssh/svn/ for Vcs-Svn field

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-system-asm.patch
1
 
diff -ur clojure.orig/build.xml clojure/build.xml
2
 
--- clojure.orig/build.xml      2008-12-16 20:51:46.000000000 +0000
3
 
+++ clojure/build.xml   2009-01-01 04:52:54.000000000 +0000
4
 
@@ -30,13 +30,13 @@
 
1
diff -ur clojure-1.0.0+dfsg.orig/build.xml clojure-1.0.0+dfsg/build.xml
 
2
--- clojure-1.0.0+dfsg.orig/build.xml   2009-05-04 07:54:26.000000000 +0100
 
3
+++ clojure-1.0.0+dfsg/build.xml        2009-05-06 22:10:40.000000000 +0100
 
4
@@ -78,13 +78,13 @@
5
5
   <target name="compile-java" depends="init"
6
6
           description="Compile Java sources.">
7
7
     <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
15
15
-          classpath="${build}:${cljsrc}">
16
16
+          classpath="${build}:${cljsrc}:${java.class.path}">
17
17
       <sysproperty key="clojure.compile.path" value="${build}"/>
18
 
       <sysproperty key="clojure.assert-if-lazy-seq" value="${clojure.assert-if-lazy-seq}"/>
19
18
       <arg value="clojure.core"/>
20
 
diff -ur clojure.orig/src/clj/clojure/core_proxy.clj clojure/src/clj/clojure/core_proxy.clj
21
 
--- clojure.orig/src/clj/clojure/core_proxy.clj 2008-12-16 20:51:42.000000000 +0000
22
 
+++ clojure/src/clj/clojure/core_proxy.clj      2009-01-01 04:58:35.000000000 +0000
 
19
       <arg value="clojure.main"/>
 
20
@@ -104,7 +104,7 @@
 
21
       </fileset>
 
22
       <manifest>
 
23
         <attribute name="Main-Class" value="clojure.main"/>
 
24
-        <attribute name="Class-Path" value="."/>
 
25
+        <attribute name="Class-Path" value="asm3.jar asm3-commons.jar"/>
 
26
       </manifest>
 
27
     </jar>
 
28
     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
 
29
diff -ur clojure-1.0.0+dfsg.orig/src/clj/clojure/core_proxy.clj clojure-1.0.0+dfsg/src/clj/clojure/core_proxy.clj
 
30
--- clojure-1.0.0+dfsg.orig/src/clj/clojure/core_proxy.clj      2009-05-04 07:54:22.000000000 +0100
 
31
+++ clojure-1.0.0+dfsg/src/clj/clojure/core_proxy.clj   2009-05-06 22:09:15.000000000 +0100
23
32
@@ -11,9 +11,9 @@
24
33
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
25
34
 
32
41
  '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
33
42
 
34
43
 (defn method-sig [#^java.lang.reflect.Method meth]
35
 
diff -ur clojure.orig/src/clj/clojure/genclass.clj clojure/src/clj/clojure/genclass.clj
36
 
--- clojure.orig/src/clj/clojure/genclass.clj   2008-12-16 20:51:42.000000000 +0000
37
 
+++ clojure/src/clj/clojure/genclass.clj        2009-01-01 04:58:05.000000000 +0000
 
44
diff -ur clojure-1.0.0+dfsg.orig/src/clj/clojure/genclass.clj clojure-1.0.0+dfsg/src/clj/clojure/genclass.clj
 
45
--- clojure-1.0.0+dfsg.orig/src/clj/clojure/genclass.clj        2009-05-04 07:54:22.000000000 +0100
 
46
+++ clojure-1.0.0+dfsg/src/clj/clojure/genclass.clj     2009-05-06 22:09:15.000000000 +0100
38
47
@@ -9,8 +9,8 @@
39
48
 (in-ns 'clojure.core)
40
49
 
46
55
         '(clojure.lang IPersistentMap))
47
56
 
48
57
 ;(defn method-sig [#^java.lang.reflect.Method meth]
49
 
diff -ur clojure.orig/src/jvm/clojure/lang/Compiler.java clojure/src/jvm/clojure/lang/Compiler.java
50
 
--- clojure.orig/src/jvm/clojure/lang/Compiler.java     2008-12-16 20:51:46.000000000 +0000
51
 
+++ clojure/src/jvm/clojure/lang/Compiler.java  2009-01-01 04:22:43.000000000 +0000
 
58
diff -ur clojure-1.0.0+dfsg.orig/src/jvm/clojure/lang/Compiler.java clojure-1.0.0+dfsg/src/jvm/clojure/lang/Compiler.java
 
59
--- clojure-1.0.0+dfsg.orig/src/jvm/clojure/lang/Compiler.java  2009-05-04 07:54:26.000000000 +0100
 
60
+++ clojure-1.0.0+dfsg/src/jvm/clojure/lang/Compiler.java       2009-05-06 22:09:15.000000000 +0100
52
61
@@ -14,9 +14,9 @@
53
62
 
54
63
 //*