This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository clojure.
commit bae031ac186dcc5231c7fb3fe4a3c9d78f36e77e Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 3 14:11:23 2016 +0200 Depend on libasm-java (>= 5.0) instead of libasm4-java --- debian/changelog | 5 +++++ debian/control | 4 ++-- debian/patches/01-replace-asm | 12 ++++++------ debian/rules | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e11110..daed3ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ clojure1.6 (1.6.0+dfsg-2) UNRELEASED; urgency=medium * Team upload. + + [ tony mancill ] * debian/copyright: - Update Format: field URL. - Associate "Files: *" with Rich Hickey copyright statement. * Depend on java6-runtime-headless. (Closes: #775450) * Bump Standards-Version to 3.9.6 (no changes) + [ Emmanuel Bourg ] + * Depend on libasm-java (>= 5.0) instead of libasm4-java + -- tony mancill <[email protected]> Sat, 17 Jan 2015 21:38:19 -0800 clojure1.6 (1.6.0+dfsg-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9872f9c..ad6b44e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Daigo Moriwaki <[email protected]> Build-Depends: debhelper (>= 9), cdbs, quilt -Build-Depends-Indep: ant, default-jdk, libasm4-java, maven-repo-helper, +Build-Depends-Indep: ant, default-jdk, libasm-java (>= 5.0), maven-repo-helper, javahelper, libtext-markdown-perl | markdown Standards-Version: 3.9.6 Homepage: http://clojure.org @@ -15,7 +15,7 @@ Package: clojure1.6 Architecture: all Depends: ${misc:Depends}, default-jre-headless | java6-runtime-headless, - libasm4-java, libjsr166y-java + libasm-java (>= 5.0), libjsr166y-java Recommends: rlwrap Conflicts: clojure (<= 1.1) Description: Lisp dialect for the JVM diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm index b1f6cc0..36b424c 100644 --- a/debian/patches/01-replace-asm +++ b/debian/patches/01-replace-asm @@ -6,7 +6,7 @@ Index: pkg-clojure/build.xml <target name="compile-java" depends="init" description="Compile Java sources."> <javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes" -+ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar" ++ classpath="/usr/share/java/asm.jar:/usr/share/java/asm-commons.jar" includeAntRuntime="false" debug="true" source="1.6" target="1.6"/> </target> @@ -15,7 +15,7 @@ Index: pkg-clojure/build.xml description="Compile Clojure sources."> <java classname="clojure.lang.Compile" - classpath="${maven.compile.classpath}:${build}:${cljsrc}" -+ classpath="/usr/share/java/asm4.jar:/usr/share/java/asm4-commons.jar:${maven.compile.classpath}:${build}:${cljsrc}" ++ classpath="/usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:${maven.compile.classpath}:${build}:${cljsrc}" failonerror="true" fork="true"> <sysproperty key="clojure.compile.path" value="${build}"/> @@ -24,7 +24,7 @@ Index: pkg-clojure/build.xml 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/asm4.jar:/usr/share/java/asm4-commons.jar:${test-classes}:${test}:${build}:${cljsrc}" ++ classpath="/usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:${test-classes}:${test}:${build}:${cljsrc}" failonerror="true" fork="true"> <sysproperty key="clojure.compile.path" value="${test-classes}"/> @@ -32,8 +32,8 @@ Index: pkg-clojure/build.xml <java classname="clojure.main" failonerror="true" fork="true"> <classpath> <pathelement path="${maven.test.classpath}"/> -+ <path location="/usr/share/java/asm4.jar"/> -+ <path location="/usr/share/java/asm4-commons.jar"/> ++ <path location="/usr/share/java/asm.jar"/> ++ <path location="/usr/share/java/asm-commons.jar"/> <path location="${test-classes}"/> <path location="${test}"/> <path location="${build}"/> @@ -42,7 +42,7 @@ Index: pkg-clojure/build.xml <manifest> <attribute name="Main-Class" value="clojure.main"/> - <attribute name="Class-Path" value="."/> -+ <attribute name="Class-Path" value="asm4.jar asm4-commons.jar jsr166y.jar"/> ++ <attribute name="Class-Path" value="asm.jar asm-commons.jar jsr166y.jar"/> </manifest> </jar> <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/> diff --git a/debian/rules b/debian/rules index 297e82b..8a1b336 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ 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 := asm4 asm4-commons +DEB_JARS := asm asm-commons DEB_INSTALL_CHANGELOGS_ALL := changes.md DEB_INSTALL_DOCS_ALL := readme.txt changes.html @@ -25,7 +25,7 @@ DEB_ANT_BUILD_TARGET := jar build/clojure1.6:: $(MDWN_DOCS) binary-install/$(SOURCE):: - $(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) + $(JAVA_HOME)/bin/java -cp /usr/share/java/asm.jar:/usr/share/java/asm-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
