[pkg-java] r8233 - in trunk/clojure/debian: . patches scripts

Peter Collingbourne pcc-guest at alioth.debian.org
Thu May 7 15:55:03 UTC 2009 

Author: pcc-guest
Date: 2009-05-07 15:55:03 +0000 (Thu, 07 May 2009)
New Revision: 8233

Modified:
   trunk/clojure/debian/README.Debian
   trunk/clojure/debian/changelog
   trunk/clojure/debian/patches/01-system-asm.patch
   trunk/clojure/debian/scripts/clojure
   trunk/clojure/debian/scripts/clojure-repl
   trunk/clojure/debian/scripts/clojurec
Log:
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

Modified: trunk/clojure/debian/README.Debian
===================================================================
--- trunk/clojure/debian/README.Debian	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/README.Debian	2009-05-07 15:55:03 UTC (rev 8233)
@@ -1,11 +1,10 @@
 clojure for Debian
 ------------------
 
-To avoid code duplication, this package uses the libasm3-java
-package rather than Clojure's private version of asm.  Therefore
-/usr/share/java/asm3.jar and /usr/share/java/asm3-commons.jar must be
-included in the classpath together with /usr/share/java/clojure.jar
-when Clojure is invoked manually.
+To avoid code duplication, this package uses the libasm3-java package
+rather than Clojure's private version of asm.  The clojure.jar file
+includes a Class-Path attribute so that the necessary dependencies
+will be brought in automatically when clojure.jar is on the classpath.
 
 This package includes three convenience scripts that correspond with
 Clojure's three main entry points: clojure (clojure.lang.Script),

Modified: trunk/clojure/debian/changelog
===================================================================
--- trunk/clojure/debian/changelog	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/changelog	2009-05-07 15:55:03 UTC (rev 8233)
@@ -5,6 +5,10 @@
     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
 
  -- Peter Collingbourne <peter at pcc.me.uk>  Thu, 07 May 2009 15:09:44 +0100
 

Modified: trunk/clojure/debian/patches/01-system-asm.patch
===================================================================
--- trunk/clojure/debian/patches/01-system-asm.patch	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/patches/01-system-asm.patch	2009-05-07 15:55:03 UTC (rev 8233)
@@ -1,7 +1,7 @@
-diff -ur clojure.orig/build.xml clojure/build.xml
---- clojure.orig/build.xml	2008-12-16 20:51:46.000000000 +0000
-+++ clojure/build.xml	2009-01-01 04:52:54.000000000 +0000
-@@ -30,13 +30,13 @@
+diff -ur clojure-1.0.0+dfsg.orig/build.xml clojure-1.0.0+dfsg/build.xml
+--- clojure-1.0.0+dfsg.orig/build.xml	2009-05-04 07:54:26.000000000 +0100
++++ clojure-1.0.0+dfsg/build.xml	2009-05-06 22:10:40.000000000 +0100
+@@ -78,13 +78,13 @@
    <target name="compile-java" depends="init"
            description="Compile Java sources.">
      <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
@@ -15,11 +15,20 @@
 -          classpath="${build}:${cljsrc}">
 +          classpath="${build}:${cljsrc}:${java.class.path}">
        <sysproperty key="clojure.compile.path" value="${build}"/>
-       <sysproperty key="clojure.assert-if-lazy-seq" value="${clojure.assert-if-lazy-seq}"/>
        <arg value="clojure.core"/>
-diff -ur clojure.orig/src/clj/clojure/core_proxy.clj clojure/src/clj/clojure/core_proxy.clj
---- clojure.orig/src/clj/clojure/core_proxy.clj	2008-12-16 20:51:42.000000000 +0000
-+++ clojure/src/clj/clojure/core_proxy.clj	2009-01-01 04:58:35.000000000 +0000
+       <arg value="clojure.main"/>
+@@ -104,7 +104,7 @@
+       </fileset>
+       <manifest>
+         <attribute name="Main-Class" value="clojure.main"/>
+-        <attribute name="Class-Path" value="."/>
++        <attribute name="Class-Path" value="asm3.jar asm3-commons.jar"/>
+       </manifest>
+     </jar>
+     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
+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
+--- clojure-1.0.0+dfsg.orig/src/clj/clojure/core_proxy.clj	2009-05-04 07:54:22.000000000 +0100
++++ clojure-1.0.0+dfsg/src/clj/clojure/core_proxy.clj	2009-05-06 22:09:15.000000000 +0100
 @@ -11,9 +11,9 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -32,9 +41,9 @@
   '(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
  
  (defn method-sig [#^java.lang.reflect.Method meth]
-diff -ur clojure.orig/src/clj/clojure/genclass.clj clojure/src/clj/clojure/genclass.clj
---- clojure.orig/src/clj/clojure/genclass.clj	2008-12-16 20:51:42.000000000 +0000
-+++ clojure/src/clj/clojure/genclass.clj	2009-01-01 04:58:05.000000000 +0000
+diff -ur clojure-1.0.0+dfsg.orig/src/clj/clojure/genclass.clj clojure-1.0.0+dfsg/src/clj/clojure/genclass.clj
+--- clojure-1.0.0+dfsg.orig/src/clj/clojure/genclass.clj	2009-05-04 07:54:22.000000000 +0100
++++ clojure-1.0.0+dfsg/src/clj/clojure/genclass.clj	2009-05-06 22:09:15.000000000 +0100
 @@ -9,8 +9,8 @@
  (in-ns 'clojure.core)
  
@@ -46,9 +55,9 @@
          '(clojure.lang IPersistentMap))
  
  ;(defn method-sig [#^java.lang.reflect.Method meth]
-diff -ur clojure.orig/src/jvm/clojure/lang/Compiler.java clojure/src/jvm/clojure/lang/Compiler.java
---- clojure.orig/src/jvm/clojure/lang/Compiler.java	2008-12-16 20:51:46.000000000 +0000
-+++ clojure/src/jvm/clojure/lang/Compiler.java	2009-01-01 04:22:43.000000000 +0000
+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
+--- clojure-1.0.0+dfsg.orig/src/jvm/clojure/lang/Compiler.java	2009-05-04 07:54:26.000000000 +0100
++++ clojure-1.0.0+dfsg/src/jvm/clojure/lang/Compiler.java	2009-05-06 22:09:15.000000000 +0100
 @@ -14,9 +14,9 @@
  
  //*

Modified: trunk/clojure/debian/scripts/clojure
===================================================================
--- trunk/clojure/debian/scripts/clojure	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/scripts/clojure	2009-05-07 15:55:03 UTC (rev 8233)
@@ -24,4 +24,4 @@
 	esac
 done
 
-exec java -cp /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/clojure.jar"$extra_classpath" clojure.lang.Script "$@"
+exec java -cp /usr/share/java/clojure.jar"$extra_classpath" clojure.lang.Script "$@"

Modified: trunk/clojure/debian/scripts/clojure-repl
===================================================================
--- trunk/clojure/debian/scripts/clojure-repl	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/scripts/clojure-repl	2009-05-07 15:55:03 UTC (rev 8233)
@@ -19,4 +19,4 @@
 	esac
 done
 
-exec java -cp /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/clojure.jar"$extra_classpath" clojure.lang.Repl "$@"
+exec java -cp /usr/share/java/clojure.jar"$extra_classpath" clojure.lang.Repl "$@"

Modified: trunk/clojure/debian/scripts/clojurec
===================================================================
--- trunk/clojure/debian/scripts/clojurec	2009-05-07 15:55:01 UTC (rev 8232)
+++ trunk/clojure/debian/scripts/clojurec	2009-05-07 15:55:03 UTC (rev 8233)
@@ -29,4 +29,4 @@
 	esac
 done
 
-exec java -cp /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/clojure.jar:"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" clojure.lang.Compile "$@"
+exec java -cp /usr/share/java/clojure.jar:"$dest_dir$extra_classpath" -Dclojure.compile.path="$dest_dir" clojure.lang.Compile "$@"

More information about the pkg-java-commits mailing list