This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to branch master in repository sisu-guice.
commit 9130cda0ef134ea2dad843ade9c05d17cc6c393a Author: Eugene Zhukov <[email protected]> Date: Thu Apr 24 16:00:23 2014 +0000 refreshed patches, d/changelog --- debian/changelog | 8 ++++++ debian/patches/allow_maven2.diff | 4 +-- debian/patches/asm3_compatible.patch | 6 ++-- debian/patches/modules.diff | 56 +++++++++++++++++++++++++++++------- 4 files changed, 58 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e7271d..edfd019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sisu-guice (3.2.1+dfsg-1) unstable; urgency=low + + * Team upload. + * New upstream release. + * Refreshed patches. + + -- Eugene Zhukov <[email protected]> Thu, 24 Apr 2014 11:10:05 +0000 + sisu-guice (3.2.0+dfsg-1) unstable; urgency=low * Team upload. diff --git a/debian/patches/allow_maven2.diff b/debian/patches/allow_maven2.diff index df75d7a..396aa35 100644 --- a/debian/patches/allow_maven2.diff +++ b/debian/patches/allow_maven2.diff @@ -1,8 +1,6 @@ -Index: b/pom.xml -=================================================================== --- a/pom.xml +++ b/pom.xml -@@ -88,11 +88,11 @@ +@@ -89,11 +89,11 @@ <module>core</module> <module>extensions</module> </modules> diff --git a/debian/patches/asm3_compatible.patch b/debian/patches/asm3_compatible.patch index 8dfab41..2f05e54 100644 --- a/debian/patches/asm3_compatible.patch +++ b/debian/patches/asm3_compatible.patch @@ -24,7 +24,7 @@ Last-Update: 2014-02-11 private String name; - LineNumberReader() { -- super(Opcodes.ASM4); +- super(Opcodes.ASM5); - } - public void visit(int version, int access, String name, String signature, @@ -90,7 +90,7 @@ Last-Update: 2014-02-11 - class LineNumberMethodVisitor extends MethodVisitor { - LineNumberMethodVisitor() { -- super(Opcodes.ASM4); +- super(Opcodes.ASM5); - } + public AnnotationVisitor visitArray(String name) { + return this; @@ -127,7 +127,7 @@ Last-Update: 2014-02-11 - class LineNumberAnnotationVisitor extends AnnotationVisitor { - LineNumberAnnotationVisitor() { -- super(Opcodes.ASM4); +- super(Opcodes.ASM5); - } - public AnnotationVisitor visitAnnotation(String name, String desc) { - return this; diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff index cb7aad0..bef56c5 100644 --- a/debian/patches/modules.diff +++ b/debian/patches/modules.diff @@ -1,20 +1,56 @@ -Index: b/extensions/pom.xml -=================================================================== ---- a/extensions/pom.xml -+++ b/extensions/pom.xml -@@ -17,6 +17,7 @@ +Description: removed some modules +Author: Eugene Zhukov <[email protected]> +Last-Update: 2014-04-24 + +--- sisu-guice-3.2.1+dfsg.orig/core/pom.xml ++++ sisu-guice-3.2.1+dfsg/core/pom.xml +@@ -36,12 +36,12 @@ + <artifactId>guava</artifactId> + <version>16.0.1</version> + </dependency> +- <dependency> ++ <!--dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>16.0.1</version> + <scope>test</scope> +- </dependency> ++ </dependency--> + <!-- + | CGLIB is embedded by default by the JarJar build profile + --> +--- sisu-guice-3.2.1+dfsg.orig/extensions/pom.xml ++++ sisu-guice-3.2.1+dfsg/extensions/pom.xml +@@ -17,7 +17,7 @@ <modules> <module>assistedinject</module> -+<!-- - <module>grapher</module> +- <module>grapher</module> ++ <!--module>grapher</module> <module>jmx</module> <module>jndi</module> -@@ -26,6 +27,7 @@ + <module>multibindings</module> +@@ -26,7 +26,7 @@ <module>spring</module> <module>struts2</module> - <module>throwingproviders</module> -+--> + <module>testlib</module> +- <module>throwingproviders</module> ++ <module>throwingproviders</module--> <!-- | not yet promoted... - - +@@ -59,12 +59,12 @@ + | Some extension tests depend on guava test libs which are not inherited + | from test scope. + --> +- <dependency> ++ <!--dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava-testlib</artifactId> + <version>16.0.1</version> + <scope>test</scope> +- </dependency> ++ </dependency--> + <!-- + | Some extension tests depend on cglib which is not embedded + | in an execution that doesn't include package. -- 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
