This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-guice.
commit c855a2a9a40ff5248df244fbddf1f9fe03c36d7a Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 3 00:52:47 2014 +0200 Build depend on libasm4-java and libcglib3-java --- debian/changelog | 2 + debian/control | 6 +- debian/copyright | 8 +- debian/maven.rules | 3 +- debian/patches/asm3_compatible.patch | 190 ----------------------------------- debian/patches/series | 1 - debian/rules | 4 +- 7 files changed, 12 insertions(+), 202 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82f7ba2..d6ab9f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sisu-guice (3.2.3+dfsg-2) UNRELEASED; urgency=medium * Team upload. * Build depend on libservlet3.1-java instead of libservlet2.5-java + * Build depend on libcglib3-java instead of libcglib-java + * Build depend on libasm4-java instead of libasm3-java * Standards-Version updated to 3.9.6 (no changes) * Removed the unused build dependencies on the *-java-doc packages * Auto update the Built-Using field from the packages used at build time diff --git a/debian/control b/debian/control index 956b9a8..9ab7abe 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,9 @@ Uploaders: Damien Raude-Morvan <[email protected]>, Eugene Zhukov <jevgeni.zh@g Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: glassfish-javaee, libaopalliance-java, - libasm3-java, + libasm4-java, libatinject-jsr330-api-java, - libcglib-java, + libcglib3-java, libguava-java, libjarjar-maven-plugin-java, libmaven-bundle-plugin-java, @@ -25,7 +25,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sisu-guice.git Package: libsisu-guice-java Architecture: all Depends: ${maven:Depends}, ${misc:Depends} -Built-Using: asm3 (= ${asm:Version}), cglib (= ${cglib:Version}) +Built-Using: libasm4-java (= ${asm:Version}), cglib3 (= ${cglib:Version}) Recommends: ${maven:OptionalDepends} Description: Patched build of Google Guice for Sisu-IoC Google Guice is a lightweight dependency injection framework diff --git a/debian/copyright b/debian/copyright index 6b72857..7eeaa6b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Sisu Guice Source: https://github.com/sonatype/sisu-guice/ Comment: - This project incorporates classes from the libasm3-java and libcglib-java + This project incorporates classes from the libasm4-java and libcglib3-java packages (versions listed in the Built-Using field in debian/control). under a different package to avoid classpath conflicts. @@ -16,14 +16,14 @@ License: Apache-2.0 Comment: Class files incorporated in sisu-guice via jarjar. The filespec is relative to the cglib source package. - See the cglib source package for more information. + See the cglib3 source package for more information. Files: src/org/objectweb/asm/* Copyright: 2004-2008 Eric Bruneton, Eugene Kuleshov Comment: Class files incorporated in sisu-guice via jarjar. - The filespec is relative to the asm3 source package. - See the asm3 source package for more information. + The filespec is relative to the libasm4-java source package. + See the libasm4-java source package for more information. License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/debian/maven.rules b/debian/maven.rules index 15c2157..1cddefe 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,9 +17,8 @@ org.sonatype.sisu.inject guice-spring jar s/.*/debian/ * * org.sonatype.sisu.inject guice-struts2 jar s/.*/debian/ * * org.sonatype.sisu.inject guice-throwingproviders jar s/.*/debian/ * * s/easymock/org.easymock/ easymock * s/.*/debian/ * * -asm * * s/3\..*/3.x/ * * org.springframework * * s/3\..*/3.x/ * * s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * * s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * * -s/org.ow2.asm/asm asm jar s/.*/3.3.2/ * * +org.ow2.asm asm jar s/.*/4.x/ * * s/org.sonatype.sisu/com.google.guava/ s/sisu-guava/guava/ jar s/.*/debian/ * * diff --git a/debian/patches/asm3_compatible.patch b/debian/patches/asm3_compatible.patch deleted file mode 100644 index 2f05e54..0000000 --- a/debian/patches/asm3_compatible.patch +++ /dev/null @@ -1,190 +0,0 @@ -Description: Changed to older revision of the class to support asm-3 -Author: Eugene Zhukov <[email protected]> -Last-Update: 2014-02-11 - ---- sisu-guice-3.1.9+dfsg.orig/core/src/com/google/inject/internal/util/LineNumbers.java -+++ sisu-guice-3.1.9+dfsg/core/src/com/google/inject/internal/util/LineNumbers.java -@@ -22,6 +22,7 @@ import com.google.common.base.Preconditi - import com.google.common.collect.Maps; - - import org.objectweb.asm.AnnotationVisitor; -+import org.objectweb.asm.Attribute; - import org.objectweb.asm.ClassReader; - import org.objectweb.asm.ClassVisitor; - import org.objectweb.asm.FieldVisitor; -@@ -122,16 +123,12 @@ final class LineNumbers { - end[NO_AOP]*/ - } - -- private class LineNumberReader extends ClassVisitor { -+ private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor { - - private int line = -1; - private String pendingMethod; - private String name; - -- LineNumberReader() { -- super(Opcodes.ASM5); -- } -- - public void visit(int version, int access, String name, String signature, - String superName, String[] interfaces) { - this.name = name; -@@ -144,7 +141,7 @@ final class LineNumbers { - } - pendingMethod = name + desc; - line = -1; -- return new LineNumberMethodVisitor(); -+ return this; - } - - public void visitSource(String source, String debug) { -@@ -163,61 +160,113 @@ final class LineNumbers { - } - } - -+ public void visitFieldInsn(int opcode, String owner, String name, -+ String desc) { -+ if (opcode == Opcodes.PUTFIELD && this.name.equals(owner) -+ && !lines.containsKey(name) && line != -1) { -+ lines.put(name, line); -+ } -+ } -+ -+ public void visitEnd() { -+ } -+ -+ public void visitInnerClass(String name, String outerName, String innerName, -+ int access) { -+ } -+ -+ public void visitOuterClass(String owner, String name, String desc) { -+ } -+ -+ public void visitAttribute(Attribute attr) { -+ } -+ - public FieldVisitor visitField(int access, String name, String desc, - String signature, Object value) { - return null; - } - - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { -- return new LineNumberAnnotationVisitor(); -+ return this; -+ } -+ -+ public AnnotationVisitor visitAnnotation(String name, String desc) { -+ return this; -+ } -+ -+ public AnnotationVisitor visitAnnotationDefault() { -+ return this; - } - - public AnnotationVisitor visitParameterAnnotation(int parameter, - String desc, boolean visible) { -- return new LineNumberAnnotationVisitor(); -+ return this; - } - -- class LineNumberMethodVisitor extends MethodVisitor { -- LineNumberMethodVisitor() { -- super(Opcodes.ASM5); -- } -+ public AnnotationVisitor visitArray(String name) { -+ return this; -+ } - -- public AnnotationVisitor visitAnnotation(String desc, boolean visible) { -- return new LineNumberAnnotationVisitor(); -- } -+ public void visitEnum(String name, String desc, String value) { -+ } - -- public AnnotationVisitor visitAnnotationDefault() { -- return new LineNumberAnnotationVisitor(); -- } -+ public void visit(String name, Object value) { -+ } - -- public void visitFieldInsn(int opcode, String owner, String name, -- String desc) { -- if (opcode == Opcodes.PUTFIELD && LineNumberReader.this.name.equals(owner) -- && !lines.containsKey(name) && line != -1) { -- lines.put(name, line); -- } -- } -+ public void visitCode() { -+ } - -- public void visitLineNumber(int line, Label start) { -- LineNumberReader.this.visitLineNumber(line, start); -- } -+ public void visitFrame(int type, int nLocal, Object[] local, int nStack, -+ Object[] stack) { - } - -- class LineNumberAnnotationVisitor extends AnnotationVisitor { -- LineNumberAnnotationVisitor() { -- super(Opcodes.ASM5); -- } -- public AnnotationVisitor visitAnnotation(String name, String desc) { -- return this; -- } -- public AnnotationVisitor visitArray(String name) { -- return this; -- } -- public void visitLocalVariable(String name, String desc, String signature, -- Label start, Label end, int index) { -- } -+ public void visitIincInsn(int var, int increment) { -+ } -+ -+ public void visitInsn(int opcode) { -+ } -+ -+ public void visitIntInsn(int opcode, int operand) { -+ } -+ -+ public void visitJumpInsn(int opcode, Label label) { -+ } -+ -+ public void visitLabel(Label label) { -+ } -+ -+ public void visitLdcInsn(Object cst) { -+ } -+ -+ public void visitLocalVariable(String name, String desc, String signature, -+ Label start, Label end, int index) { -+ } -+ -+ public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) { -+ } -+ -+ public void visitMaxs(int maxStack, int maxLocals) { -+ } -+ -+ public void visitMethodInsn(int opcode, String owner, String name, -+ String desc) { -+ } - -+ public void visitMultiANewArrayInsn(String desc, int dims) { - } - -+ public void visitTableSwitchInsn(int min, int max, Label dflt, -+ Label[] labels) { -+ } -+ -+ public void visitTryCatchBlock(Label start, Label end, Label handler, -+ String type) { -+ } -+ -+ public void visitTypeInsn(int opcode, String desc) { -+ } -+ -+ public void visitVarInsn(int opcode, int var) { -+ } - } - } diff --git a/debian/patches/series b/debian/patches/series index 434db55..d652b17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ allow_maven2.diff -asm3_compatible.patch diff --git a/debian/rules b/debian/rules index 9683214..9199a6f 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,8 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java # Variables for the Built-Using field in the control file -ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm3-java) -CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java) +ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java) +CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib3-java) DEB_DH_GENCONTROL_ARGS_ALL := -- -Vasm:Version=${ASM_VERSION} -Vcglib:Version=${CGLIB_VERSION} get-orig-source: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
