This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository easymock.
commit 3132f6ee309d7dd2f1eed14b54a2d1e449dd482c Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 29 13:11:02 2014 +0000 Depend on libcglib3-java instead of libcglib-java --- debian/build.xml | 4 ++-- debian/changelog | 1 + debian/control | 2 +- debian/pom.xml | 2 +- debian/rules | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 2e19ca5..0ba0810 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -20,8 +20,8 @@ <pathelement location="/usr/share/java/junit4.jar"/> <!-- only needed for version 3.2 and later --> <pathelement location="/usr/share/java/objenesis.jar"/> - <pathelement location="/usr/share/java/cglib.jar"/> - <pathelement location="/usr/share/java/asm3.jar"/> + <pathelement location="/usr/share/java/cglib3.jar"/> + <pathelement location="/usr/share/java/asm4.jar"/> </path> <target name="init"> diff --git a/debian/changelog b/debian/changelog index 59ef0a2..a12f9d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ easymock (3.2+ds-3) UNRELEASED; urgency=medium * Team upload. + * Depend on libcglib3-java instead of libcglib-java * Standards-Version updated to 3.9.6 (no changes) -- Emmanuel Bourg <[email protected]> Mon, 29 Sep 2014 14:46:05 +0200 diff --git a/debian/control b/debian/control index 1b34f3a..3e4462c 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: Build-Depends-Indep: default-jdk, junit4, - libcglib-java, + libcglib3-java, libobjenesis-java Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/easymock/ diff --git a/debian/pom.xml b/debian/pom.xml index 5ed93f2..7f674e0 100644 --- a/debian/pom.xml +++ b/debian/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> - <version>2.2.2</version> + <version>3.1</version> </dependency> <!-- Used for class mocking --> <dependency> diff --git a/debian/rules b/debian/rules index 2bae49e..c23b146 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/junit4.jar +export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib3.jar:/usr/share/java/junit4.jar PKD = $(abspath $(dir $(MAKEFILE_LIST))) PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
