This is an automated email from the git hooks/post-receive script. daigo pushed a commit to branch master in repository clojure.
commit 6eb2b83fae949382674297facd90008efb0ef740 Author: Daigo Moriwaki <[email protected]> Date: Sat Jun 14 10:34:44 2014 +0900 New upstream release. --- debian/changelog | 6 ++ .../{clojure1.4.postinst => clojure1.6.postinst} | 6 +- debian/{clojure1.4.prerm => clojure1.6.prerm} | 2 +- debian/control | 11 +- debian/copyright | 12 ++- debian/patches/01-replace-asm | 118 +++++++++++---------- debian/rules | 8 +- 7 files changed, 89 insertions(+), 74 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f15897..cfa07f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +clojure1.6 (1.6.0+dfsg-1) unstable; urgency=medium + + * New upstream release. + + -- Daigo Moriwaki <[email protected]> Sat, 14 Jun 2014 10:31:12 +0900 + clojure1.4 (1.4.0+dfsg-3) unstable; urgency=low * Team upload. diff --git a/debian/clojure1.4.postinst b/debian/clojure1.6.postinst similarity index 93% rename from debian/clojure1.4.postinst rename to debian/clojure1.6.postinst index f20637f..eec4d3c 100644 --- a/debian/clojure1.4.postinst +++ b/debian/clojure1.6.postinst @@ -4,13 +4,13 @@ set -e if [ "$1" = "configure" ] then - CLOJUREVER=1.4 + CLOJUREVER=1.6 update-alternatives --install \ - /usr/bin/clojure clojure /usr/bin/clojure${CLOJUREVER} 30 \ + /usr/bin/clojure clojure /usr/bin/clojure${CLOJUREVER} 40 \ --slave /usr/share/man/man1/clojure.1.gz clojure.1.gz /usr/share/man/man1/clojure${CLOJUREVER}.1.gz \ --slave /usr/share/java/clojure.jar clojure.jar /usr/share/java/clojure-${CLOJUREVER}.jar update-alternatives --install \ - /usr/bin/clojurec clojurec /usr/bin/clojurec${CLOJUREVER} 30 \ + /usr/bin/clojurec clojurec /usr/bin/clojurec${CLOJUREVER} 40 \ --slave /usr/share/man/man1/clojurec.1.gz clojurec.1.gz /usr/share/man/man1/clojurec${CLOJUREVER}.1.gz fi #DEBHELPER# diff --git a/debian/clojure1.4.prerm b/debian/clojure1.6.prerm similarity index 90% rename from debian/clojure1.4.prerm rename to debian/clojure1.6.prerm index e23f794..c495880 100644 --- a/debian/clojure1.4.prerm +++ b/debian/clojure1.6.prerm @@ -3,7 +3,7 @@ set -e if [ "$1" = "remove" ]; then - CLOJUREVER=1.4 + CLOJUREVER=1.6 update-alternatives --remove clojure /usr/bin/clojure${CLOJUREVER} update-alternatives --remove clojurec /usr/bin/clojurec${CLOJUREVER} fi diff --git a/debian/control b/debian/control index 0d3c68d..ca7c0ea 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,21 @@ -Source: clojure1.4 +Source: clojure1.6 Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Peter Collingbourne <[email protected]>, - Daigo Moriwaki <[email protected]> +Uploaders: Daigo Moriwaki <[email protected]> Build-Depends: debhelper (>= 9), cdbs, quilt -Build-Depends-Indep: ant, default-jdk, libasm3-java, maven-repo-helper, +Build-Depends-Indep: ant, default-jdk, libasm4-java, maven-repo-helper, javahelper, libtext-markdown-perl | markdown Standards-Version: 3.9.5 Homepage: http://clojure.org Vcs-Git: git://git.debian.org/git/pkg-java/clojure.git Vcs-Browser: http://git.debian.org/?p=pkg-java/clojure.git -Package: clojure1.4 +Package: clojure1.6 Architecture: all Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, - libasm3-java + libasm4-java, libjsr166y-java Recommends: rlwrap Conflicts: clojure (<= 1.1) Description: Lisp dialect for the JVM diff --git a/debian/copyright b/debian/copyright index e54e6b9..ba4d738 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,16 +10,18 @@ Files: src/clj/clojure/repl.clj Copyright: Copyright (c) Chris Houser, Dec 2008. All rights reserved. License: CPL-1 -Files: src/jvm/clojure/asm/* -Copyright: Copyright (c) 2000-2005 INRIA, France Telecom -License: BSD-3-clause +Files: src/jvm/clojure/lang/Murmur3.java +Copyright: Copyright (C) 2011 The Guava Authors +License: Apache-2 Files: debian/* Copyright: Copyright (C) 2010 Peter Collingbourne <[email protected]> + Copyright (C) 2011 Daigo Moriwaki <[email protected]> License: GPL-2+ Files: debian/patches/* Copyright: Copyright (C) 2010 Peter Collingbourne <[email protected]> + Copyright (C) 2011 Daigo Moriwaki <[email protected]> License: EPL-1 License: EPL-1 @@ -509,3 +511,7 @@ License: GPL-2+ On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. + +License: Apache-2 + On Debian systems, the full text of the Apache License version 2 can be + found in the file `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm index 887128a..b1f6cc0 100644 --- a/debian/patches/01-replace-asm +++ b/debian/patches/01-replace-asm @@ -1,56 +1,56 @@ Index: pkg-clojure/build.xml =================================================================== ---- 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 @@ +--- 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 +@@ -37,6 +37,7 @@ <target name="compile-java" depends="init" description="Compile Java sources."> <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes" -+ classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar" ++ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar" includeAntRuntime="false" - debug="true" source="1.5" target="1.5"/> + debug="true" source="1.6" target="1.6"/> </target> -@@ -43,7 +44,7 @@ +@@ -44,7 +45,7 @@ <target name="compile-clojure" description="Compile Clojure sources."> <java classname="clojure.lang.Compile" -- classpath="${build}:${cljsrc}" -+ classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${build}:${cljsrc}" +- classpath="${maven.compile.classpath}:${build}:${cljsrc}" ++ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:${maven.compile.classpath}:${build}:${cljsrc}" failonerror="true" fork="true"> <sysproperty key="clojure.compile.path" value="${build}"/> -@@ -83,7 +84,7 @@ +@@ -86,7 +87,7 @@ <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes" - debug="true" source="1.5" target="1.5" includeantruntime="no"/> + debug="true" source="1.6" target="1.6" includeantruntime="no"/> <java classname="clojure.lang.Compile" - classpath="${test-classes}:${test}:${build}:${cljsrc}" -+ classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${test-classes}:${test}:${build}:${cljsrc}" ++ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:${test-classes}:${test}:${build}:${cljsrc}" failonerror="true" fork="true"> <sysproperty key="clojure.compile.path" value="${test-classes}"/> -@@ -100,6 +101,8 @@ - unless="maven.test.skip"> +@@ -105,6 +106,8 @@ <java classname="clojure.main" failonerror="true" fork="true"> <classpath> -+ <path location="/usr/share/java/asm3.jar"/> -+ <path location="/usr/share/java/asm3-commons.jar"/> + <pathelement path="${maven.test.classpath}"/> ++ <path location="/usr/share/java/asm4.jar"/> ++ <path location="/usr/share/java/asm4-commons.jar"/> <path location="${test-classes}"/> <path location="${test}"/> <path location="${build}"/> -@@ -121,7 +124,7 @@ +@@ -126,7 +129,7 @@ </fileset> <manifest> <attribute name="Main-Class" value="clojure.main"/> - <attribute name="Class-Path" value="."/> -+ <attribute name="Class-Path" value="/usr/share/java/asm3.jar /usr/share/java/asm3-commons.jar"/> ++ <attribute name="Class-Path" value="asm4.jar asm4-commons.jar jsr166y.jar"/> </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 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 @@ +--- 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 +@@ -4999,10 +4999,10 @@ (.getAnnotation c java.lang.annotation.Retention)] (= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME))))) @@ -63,7 +63,7 @@ Index: pkg-clojure/src/clj/clojure/core.clj (cond (vector? v) (let [avec (.visitArray av name)] (doseq [vval v] -@@ -4799,7 +4799,7 @@ +@@ -5012,7 +5012,7 @@ (cond (instance? java.lang.Enum ev) (.visitEnum av name (descriptor (class ev)) (str ev)) @@ -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-05-19 20:06:17.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/core_proxy.clj 2012-05-19 20:07:47.000000000 +0900 +--- 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 @@ -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-05-19 20:06:17.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/genclass.clj 2012-05-19 20:07:47.000000000 +0900 +--- 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 @@ -9,8 +9,8 @@ (in-ns 'clojure.core) @@ -105,26 +105,28 @@ 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-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 @@ +--- 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 +@@ -12,11 +12,13 @@ package clojure.lang; -//* +/* ++ ++import org.objectweb.asm.*; ++import org.objectweb.asm.commons.GeneratorAdapter; ++import org.objectweb.asm.commons.Method; - import clojure.asm.*; - import clojure.asm.commons.GeneratorAdapter; - import clojure.asm.commons.Method; - +-import clojure.asm.*; +-import clojure.asm.commons.GeneratorAdapter; +-import clojure.asm.commons.Method; +*/ -+ + import java.io.*; import java.lang.reflect.Constructor; - import java.lang.reflect.Modifier; -@@ -25,14 +27,15 @@ - import java.util.regex.Pattern; +@@ -26,14 +28,15 @@ + import java.util.regex.Matcher; //*/ -/* @@ -143,8 +145,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-05-19 20:06:17.000000000 +0900 -+++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2012-05-19 20:07:47.000000000 +0900 +--- 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 @@ -12,7 +12,7 @@ package clojure.lang; @@ -156,22 +158,22 @@ 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-05-19 20:06:17.000000000 +0900 -+++ pkg-clojure/src/clj/clojure/reflect/java.clj 2012-05-19 20:07:47.000000000 +0900 +--- 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 @@ -11,7 +11,7 @@ (require '[clojure.set :as set] '[clojure.string :as str]) --(import '[clojure.asm ClassReader ClassVisitor Type] -+(import '[org.objectweb.asm ClassReader ClassVisitor Type] +-(import '[clojure.asm ClassReader ClassVisitor Type Opcodes] ++(import '[org.objectweb.asm ClassReader ClassVisitor Type Opcodes] '[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 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 @@ +--- 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 +@@ -25,7 +25,7 @@ (deftest field-descriptor->class-symbol-test (are [s d] (= s (@#'reflect/field-descriptor->class-symbol d)) @@ -182,22 +184,22 @@ Index: pkg-clojure/test/clojure/test_clojure/reflect.clj 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> +--- 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 +@@ -57,6 +57,16 @@ + </exclusion> + </exclusions> + </dependency> + <dependency> -+ <groupId>asm</groupId> ++ <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> -+ <version>3.x</version> ++ <version>5.0.3</version> + </dependency> + <dependency> -+ <groupId>asm</groupId> ++ <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> -+ <version>3.x</version> ++ <version>5.0.3</version> + </dependency> -+ </dependencies> - </project> + </dependencies> + + <build> diff --git a/debian/rules b/debian/rules index fdd405c..297e82b 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,17 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_JARS := asm3 asm3-commons +DEB_JARS := asm4 asm4-commons DEB_INSTALL_CHANGELOGS_ALL := changes.md DEB_INSTALL_DOCS_ALL := readme.txt changes.html +# Prevent test from running because executing test requires a third-party library called test.generative +DEB_ANT_BUILD_TARGET := jar -build/clojure1.4:: $(MDWN_DOCS) +build/clojure1.6:: $(MDWN_DOCS) binary-install/$(SOURCE):: - $(JAVA_HOME)/bin/java -cp /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:clojure.jar clojure.main debian/gencompletions.clj > debian/$(SOURCE)/etc/rlwrap/clojure$(VER) + $(JAVA_HOME)/bin/java -cp /usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:clojure.jar clojure.main debian/gencompletions.clj > debian/$(SOURCE)/etc/rlwrap/clojure$(VER) binary-post-install/$(SOURCE):: sed -i 's/@VER@/$(VER)/g' debian/$(SOURCE)/usr/bin/* -- 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
