[guice] 01/12: Fixed a build failure caused by the cglib/asm transition

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository guice.

commit 5680099f954361f7aaad3bfd6d96f265d41ac39a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 9 11:41:24 2014 +0200

    Fixed a build failure caused by the cglib/asm transition
---
 debian/changelog                                 | 6 ++++++
 debian/patches/03_extensions-assistedinject.diff | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b65fad..20e7591 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guice (3.0-6) UNRELEASED; urgency=medium
+
+  * Fixed a build failure caused by the cglib/asm transition
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 09 Oct 2014 11:40:23 +0200
+
 guice (3.0-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/03_extensions-assistedinject.diff b/debian/patches/03_extensions-assistedinject.diff
index a00b211..1387890 100644
--- a/debian/patches/03_extensions-assistedinject.diff
+++ b/debian/patches/03_extensions-assistedinject.diff
@@ -37,8 +37,8 @@ Last-Update: 2012-08-09
        <fileset dir="${build.dir}/classes"/>
 -      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
 -      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
-+      <zipfileset src="${debian.lib.dir}/cglib.jar"/>
-+      <zipfileset src="${debian.lib.dir}/asm3.jar"/>
++      <zipfileset src="${debian.lib.dir}/cglib3.jar"/>
++      <zipfileset src="${debian.lib.dir}/asm4.jar"/>
        <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
        <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib. at 1.$@2"/>
        <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git