[guice] 02/07: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Oct 18 16:39:40 BST 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository guice.
commit ef8be9ccbcfda5c75aa835ecb56aa2132cb43ec8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Oct 18 16:32:06 2014 +0200
Refreshed the patches
---
debian/changelog | 5 +-
debian/patches/01_fix_build.diff | 59 +--------
debian/patches/02_link_javadocs.diff | 19 +--
debian/patches/04_java8-compatibility.diff | 18 ---
debian/patches/05_upgrade-asm-and-cglib.patch | 176 --------------------------
debian/patches/series | 2 -
6 files changed, 15 insertions(+), 264 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a5fc6b6..7f70a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-guice (3.0-7) UNRELEASED; urgency=medium
+guice (4.0~beta5-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Removed 04_java8-compatibility.diff and 05_upgrade-asm-and-cglib.patch
+ (fixed upstream)
* Use XZ compression for the upstream tarball
* debian/watch: Watch the release tags on Github
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
index abc8461..97f9bbd 100644
--- a/debian/patches/01_fix_build.diff
+++ b/debian/patches/01_fix_build.diff
@@ -6,7 +6,7 @@ Last-Update: 2011-09-06
--- a/build.xml
+++ b/build.xml
-@@ -10,10 +10,12 @@
+@@ -18,10 +18,12 @@
</path>
@@ -21,60 +21,3 @@ Last-Update: 2011-09-06
</jar>
</target>
-@@ -118,7 +120,6 @@
-
- <!-- Generate API for current version. -->
- <javadoc packagenames="com.google.*"
-- docletpath="${jdiff.home}/jdiff.jar${path.separator}${jdiff.home}/xerces.jar"
- maxmemory="512M"
- classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
- <fileset dir="${src.dir}" defaultexcludes="yes">
-@@ -166,14 +167,14 @@
- <target name="javadoc">
- <javadoc packagenames="com.google.*"
- destdir="build/docs"
-- docletpath="lib/build/doclava.jar"
- bootclasspath="${java.home}/lib/rt.jar"
- maxmemory="512M"
-- classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
-+ classpath="compile.classpath">
- <fileset dir="${src.dir}" defaultexcludes="yes">
- <include name="com/google/**"/>
- <exclude name="com/google/inject/internal/**"/>
- </fileset>
-+ <!--
- <fileset dir="${servlet.src.dir}"/>
- <fileset dir="${spring.src.dir}"/>
- <fileset dir="${assistedinject.src.dir}"/>
-@@ -183,9 +184,11 @@
- <fileset dir="${multibindings.src.dir}"/>
- <fileset dir="${persist.src.dir}"/>
- <fileset dir="${grapher.src.dir}"/>
-+ -->
- <!-- TODO: this breaks Doclava for some reason
- <fileset dir="${struts2.src.dir}"/> -->
-
-+ <!--
- <doclet name="com.google.doclava.Doclava">
- <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/>
- <param name="-since"/> <param name="lib/build/guice-1.0.xml"/> <param name="Guice_1.0" />
-@@ -193,15 +196,18 @@
- <param name="-apiversion" value="Guice_${new.api}"/>
- <param name="-assetsdir" value="javadoc/assets"/>
- <param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
-+ -->
- <!-- TODO: fix doclava federation
- http://aopalliance.sourceforge.net/doc
- http://www.springframework.org/docs/api/
- <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
- <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
- -->
-+ <!--
- </doclet>
-+ -->
- </javadoc>
-- <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>
-+ <!--<move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>-->
- </target>
-
- <target name="no_aop"
diff --git a/debian/patches/02_link_javadocs.diff b/debian/patches/02_link_javadocs.diff
index d5b2d88..bb0cc10 100644
--- a/debian/patches/02_link_javadocs.diff
+++ b/debian/patches/02_link_javadocs.diff
@@ -3,13 +3,14 @@ Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-09-04
---- guice-3.0.orig/build.xml
-+++ guice-3.0/build.xml
-@@ -178,6 +178,7 @@
- <include name="com/google/**"/>
- <exclude name="com/google/inject/internal/**"/>
- </fileset>
+--- a/build.xml
++++ b/build.xml
+@@ -242,7 +242,7 @@
+ <fileset dir="${jmx.src.dir}"/>
+
+ <link href="http://aopalliance.sourceforge.net/doc/"/>
+- <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="file:///usr/share/doc/default-jdk-doc/api/"/>
- <!--
- <fileset dir="${servlet.src.dir}"/>
- <fileset dir="${spring.src.dir}"/>
+ <link href="http://atinject.googlecode.com/svn/trunk/javadoc/"/>
+ <link href="http://docs.guava-libraries.googlecode.com/git/javadoc/"/>
+ <link href="https://tomcat.apache.org/tomcat-5.5-doc/servletapi/"/>
diff --git a/debian/patches/04_java8-compatibility.diff b/debian/patches/04_java8-compatibility.diff
deleted file mode 100644
index 0124899..0000000
--- a/debian/patches/04_java8-compatibility.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Java 8 is more restrictive about generic type inference in situations
- involving raw types, which prevents guice from compiling. This change
- allows guice to be compiled with javac 8.
-Origin: backport, https://github.com/google/guice/commit/3382133
---- a/core/src/com/google/inject/spi/DefaultBindingTargetVisitor.java
-+++ b/core/src/com/google/inject/spi/DefaultBindingTargetVisitor.java
-@@ -69,9 +69,9 @@
- return visitOther(convertedConstantBinding);
- }
-
-- // javac says it's an error to cast ProviderBinding<? extends T> to Binding<? extends T>
- @SuppressWarnings("unchecked")
- public V visit(ProviderBinding<? extends T> providerBinding) {
-- return visitOther((Binding) providerBinding);
-+ // TODO(cushon): remove raw (Binding) cast when we don't care about javac 6 anymore
-+ return visitOther((Binding<? extends T>) (Binding) providerBinding);
- }
- }
diff --git a/debian/patches/05_upgrade-asm-and-cglib.patch b/debian/patches/05_upgrade-asm-and-cglib.patch
deleted file mode 100644
index b7a9bfd..0000000
--- a/debian/patches/05_upgrade-asm-and-cglib.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Description: Upgrade to ASM 4 and CGLIB 3
-Origin: backport, https://github.com/google/guice/commit/2303007
---- a/core/src/com/google/inject/internal/util/LineNumbers.java
-+++ b/core/src/com/google/inject/internal/util/LineNumbers.java
-@@ -26,7 +26,6 @@
- import java.lang.reflect.Method;
- import java.util.Map;
- 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;
-@@ -119,12 +118,16 @@
- end[NO_AOP]*/
- }
-
-- private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor {
-+ private class LineNumberReader extends ClassVisitor {
-
- private int line = -1;
- private String pendingMethod;
- private String name;
-
-+ LineNumberReader() {
-+ super(Opcodes.ASM4);
-+ }
-+
- public void visit(int version, int access, String name, String signature,
- String superName, String[] interfaces) {
- this.name = name;
-@@ -137,7 +140,7 @@
- }
- pendingMethod = name + desc;
- line = -1;
-- return this;
-+ return new LineNumberMethodVisitor();
- }
-
- public void visitSource(String source, String debug) {
-@@ -156,113 +159,61 @@
- }
- }
-
-- 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 this;
-- }
--
-- public AnnotationVisitor visitAnnotation(String name, String desc) {
-- return this;
-- }
--
-- public AnnotationVisitor visitAnnotationDefault() {
-- return this;
-+ return new LineNumberAnnotationVisitor();
- }
-
- public AnnotationVisitor visitParameterAnnotation(int parameter,
- String desc, boolean visible) {
-- return this;
-+ return new LineNumberAnnotationVisitor();
- }
-
-- public AnnotationVisitor visitArray(String name) {
-- return this;
-+ class LineNumberMethodVisitor extends MethodVisitor {
-+ LineNumberMethodVisitor() {
-+ super(Opcodes.ASM4);
- }
-
-- public void visitEnum(String name, String desc, String value) {
-+ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-+ return new LineNumberAnnotationVisitor();
- }
-
-- public void visit(String name, Object value) {
-+ public AnnotationVisitor visitAnnotationDefault() {
-+ return new LineNumberAnnotationVisitor();
- }
-
-- public void visitCode() {
-+ 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 visitFrame(int type, int nLocal, Object[] local, int nStack,
-- Object[] stack) {
- }
-
-- public void visitIincInsn(int var, int increment) {
-+ public void visitLineNumber(int line, Label start) {
-+ LineNumberReader.this.visitLineNumber(line, start);
- }
--
-- public void visitInsn(int opcode) {
- }
-
-- public void visitIntInsn(int opcode, int operand) {
-+ class LineNumberAnnotationVisitor extends AnnotationVisitor {
-+ LineNumberAnnotationVisitor() {
-+ super(Opcodes.ASM4);
- }
--
-- public void visitJumpInsn(int opcode, Label label) {
-+ public AnnotationVisitor visitAnnotation(String name, String desc) {
-+ return this;
- }
--
-- public void visitLabel(Label label) {
-+ public AnnotationVisitor visitArray(String name) {
-+ return this;
- }
--
-- 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 7b2914d..6ac912c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
01_fix_build.diff
02_link_javadocs.diff
-04_java8-compatibility.diff
-05_upgrade-asm-and-cglib.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git
More information about the pkg-java-commits
mailing list