This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guice.
commit ae739da775c91266c150a4f33adf9bed6057748d Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 10 09:59:52 2016 +0100 Upload to unstable --- debian/changelog | 5 +++-- debian/control | 4 ++-- debian/maven.rules | 2 -- debian/rules | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36f9d1a..30f3b75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -guice (4.0-2) UNRELEASED; urgency=medium +guice (4.0-2) unstable; urgency=medium * Team upload. * Fixed the build failure with Java 8 + * Depend on libcglib-java (>= 3.2) instead of libcglib3-java * Standards-Version updated to 3.9.7 (no changes) - -- Emmanuel Bourg <[email protected]> Wed, 10 Feb 2016 09:37:43 +0100 + -- Emmanuel Bourg <[email protected]> Wed, 10 Feb 2016 09:59:49 +0100 guice (4.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 94986cb..15d01e9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), libasm4-java, libatinject-jsr330-api-java, libbuild-helper-maven-plugin-java, - libcglib3-java, + libcglib-java (>= 3.2), libguava-java, libjarjar-maven-plugin-java, libmaven-bundle-plugin-java, @@ -28,7 +28,7 @@ Package: libguice-java Architecture: all Depends: ${misc:Depends}, ${maven:Depends} Suggests: ${maven:OptionalDepends} -Built-Using: libasm4-java (= ${asm:Version}), cglib3 (= ${cglib:Version}) +Built-Using: libasm4-java (= ${asm:Version}), cglib (= ${cglib:Version}) Description: lightweight dependency injection framework for Java 5 and above Guice provides support for dependency injection using annotations to configure Java objects. Dependency injection is a design pattern whose diff --git a/debian/maven.rules b/debian/maven.rules index 796ae4f..32b2433 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,3 @@ -s/org.sonatype.sisu.inject/cglib/ cglib * s/.*/3.x/ * * javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * * org.springframework spring-beans * s/.*/3.x/ * * -cglib cglib * s/.*/3.x/ * * org.ow2.asm asm* * s/.*/4.x/ * * diff --git a/debian/rules b/debian/rules index 49be7c7..c7e471b 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java # 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/guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
