This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository easymock.
commit 4f46e199b6882b122790629a7cb6b3d3d80ebe62 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 26 16:50:05 2016 +0200 Depend on libcglib-java instead of libcglib3-java --- debian/build.xml | 4 ++-- debian/changelog | 7 +++++++ debian/control | 2 +- debian/maven.rules | 2 -- debian/rules | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index e6c5dbf..daeecf5 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -22,8 +22,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/cglib3.jar"/> - <pathelement location="/usr/share/java/asm4.jar"/> + <pathelement location="/usr/share/java/cglib.jar"/> + <pathelement location="/usr/share/java/asm.jar"/> </path> <target name="init"> diff --git a/debian/changelog b/debian/changelog index ed9dff7..b74df4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +easymock (3.3.1+ds-4) UNRELEASED; urgency=medium + + * Team upload. + * Depend on libcglib-java instead of libcglib3-java + + -- Emmanuel Bourg <[email protected]> Mon, 26 Sep 2016 16:48:24 +0200 + easymock (3.3.1+ds-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index c24731e..b79d807 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: Build-Depends-Indep: default-jdk, junit4, - libcglib3-java, + libcglib-java, libobjenesis-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/easymock.git diff --git a/debian/maven.rules b/debian/maven.rules deleted file mode 100644 index 032f4e3..0000000 --- a/debian/maven.rules +++ /dev/null @@ -1,2 +0,0 @@ -cglib cglib * s/.*/3.x/ * * -org.ow2.asm asm * s/.*/4.x/ * * diff --git a/debian/rules b/debian/rules index c23b146..2bae49e 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/cglib3.jar:/usr/share/java/junit4.jar +export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.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
