This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-guice.
commit ce442335e143631be7910b8bda10a994b2c4f014 Author: Emmanuel Bourg <[email protected]> Date: Thu Feb 11 10:01:36 2016 +0100 Depend on libcglib-java (>= 3.2) instead of libcglib3-java --- debian/changelog | 1 + debian/control | 4 ++-- debian/copyright | 4 ++-- debian/maven.rules | 2 -- debian/rules | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90909e8..3c88d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ sisu-guice (3.2.6-2) UNRELEASED; urgency=medium * Team upload. * Fixed the build failure with Java 8 (Closes: #814406) + * Depend on libcglib-java (>= 3.2) instead of libcglib3-java * Standards-Version updated to 3.9.7 (no changes) * Build with the DH sequencer instead of CDBS diff --git a/debian/control b/debian/control index bc52dd6..f16eea7 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends-Indep: glassfish-javaee, libaopalliance-java, libasm4-java, libatinject-jsr330-api-java, - libcglib3-java, + libcglib-java (>= 3.2), libguava-java, libjarjar-maven-plugin-java, libmaven-bundle-plugin-java (>= 2.3.7-2~), @@ -25,7 +25,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sisu-guice.git Package: libsisu-guice-java Architecture: all Depends: ${maven:Depends}, ${misc:Depends} -Built-Using: libasm4-java (= ${asm:Version}), cglib3 (= ${cglib:Version}) +Built-Using: libasm4-java (= ${asm:Version}), cglib (= ${cglib:Version}) Recommends: ${maven:OptionalDepends} Description: Patched build of Google Guice for Sisu-IoC Google Guice is a lightweight dependency injection framework diff --git a/debian/copyright b/debian/copyright index 7eeaa6b..c03f400 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Sisu Guice Source: https://github.com/sonatype/sisu-guice/ Comment: - This project incorporates classes from the libasm4-java and libcglib3-java + This project incorporates classes from the libasm4-java and libcglib-java packages (versions listed in the Built-Using field in debian/control). under a different package to avoid classpath conflicts. @@ -16,7 +16,7 @@ License: Apache-2.0 Comment: Class files incorporated in sisu-guice via jarjar. The filespec is relative to the cglib source package. - See the cglib3 source package for more information. + See the cglib source package for more information. Files: src/org/objectweb/asm/* Copyright: 2004-2008 Eric Bruneton, Eugene Kuleshov diff --git a/debian/maven.rules b/debian/maven.rules index b067060..3645209 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,9 +17,7 @@ org.sonatype.sisu.inject guice-servlet jar s/.*/debian/ * * org.sonatype.sisu.inject guice-spring jar s/.*/debian/ * * org.sonatype.sisu.inject guice-struts2 jar s/.*/debian/ * * org.sonatype.sisu.inject guice-throwingproviders jar s/.*/debian/ * * -cglib cglib * s/.*/3.x/ * * s/easymock/org.easymock/ easymock * s/.*/debian/ * * -cglib * * s/3\..*/3.x/ * * org.ow2.asm * * s/.*/4.x/ * * org.springframework * * s/3\..*/3.x/ * * s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index 7807a40..adb6a5e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # Variables for the Built-Using field in the control file ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java) -CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib3-java) +CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java) %: dh $@ --buildsystem=maven -- 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
