[jmock2] 02/03: Depend on libcglib3-java and libasm4-java

[Emmanuel Bourg]

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

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

commit ae0ec83c9fe7d1b45c94fc5c2fab8276c7d2fc69
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 14:43:55 2014 +0200

    Depend on libcglib3-java and libasm4-java
---
 debian/changelog                        | 1 +
 debian/control                          | 4 ++--
 debian/maven.rules                      | 2 +-
 debian/patches/03runtestsagainstsyslibs | 2 +-
 debian/patches/08mavenpoms              | 2 +-
 debian/rules                            | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 052db2e..b9d8dc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jmock2 (2.7~snapshot+201309170925-gitd7fe69b5+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libcglib3-java and libasm4-java
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Sep 2014 14:32:18 +0200
diff --git a/debian/control b/debian/control
index 510ed98..7b533de 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>, Stephen Nelson <stephen at eccostudio.com>
 Build-Depends: debhelper (>= 9), javahelper (>= 0.29), ant, cdbs, ant-optional,
  maven-repo-helper
-Build-Depends-Indep: default-jdk, libhamcrest-java (>= 1.3), libcglib-java, libasm3-java,
+Build-Depends-Indep: default-jdk, libhamcrest-java (>= 1.3), libcglib3-java, libasm4-java,
  junit4, bsh, libobjenesis-java
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jmock2.git
@@ -14,7 +14,7 @@ Homepage: http://www.jmock.org/
 
 Package: libjmock2-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, libcglib-java, libobjenesis-java
+Depends: ${java:Depends}, ${misc:Depends}, libcglib3-java, libobjenesis-java
 Description: Java library for testing code with mock objects
  Mock objects help you design and test the interactions between the objects in
  your programs.
diff --git a/debian/maven.rules b/debian/maven.rules
index fada0ea..c72e70e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,6 @@
 s/org.jmock/jmock/ jmock* jar s/2\..*/2.x/ * *
 junit s/junit-dep/junit/ jar s/.*/4.x/ * *
-cglib s/cglib-nodep/cglib/ jar s/.*/debian/ * *
+cglib s/cglib-nodep/cglib/ jar s/.*/3.x/ * *
 org.objenesis objenesis jar s/.*/debian/ * *
 junit junit jar s/3\..*/3.x/ * *
 org.beanshell bsh jar s/.*/debian/ * *
diff --git a/debian/patches/03runtestsagainstsyslibs b/debian/patches/03runtestsagainstsyslibs
index 0c67796..aa21bf0 100644
--- a/debian/patches/03runtestsagainstsyslibs
+++ b/debian/patches/03runtestsagainstsyslibs
@@ -9,7 +9,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		<fileset dir="lib" includes="*.jar" excludes="*-src.jar"/>
 +		<fileset dir="/usr/share/java" includes="hamcrest-core.jar"/>
 +                <fileset dir="/usr/share/java" includes="hamcrest-library.jar"/>
-+                <fileset dir="/usr/share/java" includes="cglib-nodep.jar"/>
++                <fileset dir="/usr/share/java" includes="cglib3-nodep.jar"/>
 +                <fileset dir="/usr/share/java" includes="objenesis.jar"/>
 +                <fileset dir="/usr/share/java" includes="junit4.jar"/>
 +                <fileset dir="/usr/share/java" includes="bsh.jar"/>    
diff --git a/debian/patches/08mavenpoms b/debian/patches/08mavenpoms
index b9c5df9..cf5a14b 100644
--- a/debian/patches/08mavenpoms
+++ b/debian/patches/08mavenpoms
@@ -98,7 +98,7 @@ Last-Update: 2013-09-29
 +        <dependency>
 +            <groupId>cglib</groupId>
 +            <artifactId>cglib-nodep</artifactId>
-+            <version>2.1_3</version>
++            <version>3.1</version>
 +        </dependency>
 +    </dependencies>
 +
diff --git a/debian/rules b/debian/rules
index 5e425a1..b2e0950 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS  := hamcrest-core hamcrest-library junit4 cglib-nodep bsh asm3 objenesis \
+DEB_JARS  := hamcrest-core hamcrest-library junit4 cglib3-nodep bsh asm4 objenesis \
 		ant-junit
 DEB_ANT_BUILD_TARGET = zip.jars javadoc
 #UVERSION  := $(shell dpkg-parsechangelog|grep ^Version:|cut -f2 -d' '|sed 's/+dfsg-[^-]*$$//')

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