This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc.
commit 6a14ace6f7f673d735b5efef28597eafd3f5fbaa Author: Emmanuel Bourg <[email protected]> Date: Wed Sep 6 00:58:31 2017 +0200 Depend on libplexus-component-annotations-java instead of libplexus-containers1.5-java --- debian/changelog | 2 ++ debian/control | 2 +- debian/patches/version_plexus.diff | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8eb5c8e..19eba0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ sisu-ioc (2.3.0-10) UNRELEASED; urgency=medium * Team upload. + * Depend on libplexus-component-annotations-java + instead of libplexus-containers1.5-java * Standards-Version updated to 4.1.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 085af27..982f9c4 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends-Indep: junit4, libmaven-dependency-plugin-java, libmaven-install-plugin-java, libplexus-classworlds2-java, - libplexus-containers1.5-java, + libplexus-component-annotations-java, libplexus-utils2-java, libsisu-guice-java, testng (>= 6.8.7) diff --git a/debian/patches/version_plexus.diff b/debian/patches/version_plexus.diff index a1b74c8..a0b21c3 100644 --- a/debian/patches/version_plexus.diff +++ b/debian/patches/version_plexus.diff @@ -1,4 +1,4 @@ -Description: Force usage of default "debian" release of plexus-component-annotations +Description: Force usage of default "1.5.5" release of plexus-component-annotations since <configuration/> items are not touched by maven-debian-helper tool. Author: Damien Raude-Morvan <[email protected]> Forwarded: not-needed @@ -12,7 +12,7 @@ Index: b/sisu-inject/containers/guice-plexus/guice-plexus-binders/pom.xml <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-annotations</artifactId> - <version>1.2.1</version> -+ <version>debian</version> ++ <version>1.5.5</version> </artifactItem> </artifactItems> </configuration> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
