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 59f0d2519bddf2ec7e0f4bee157d34f2b2a13e3a Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 17 12:13:06 2015 +0100 Replaced guice_classifier.diff with a Maven rule --- debian/changelog | 7 +++++++ debian/maven.ignoreRules | 1 + debian/patches/guice_classifier.diff | 31 ------------------------------- debian/patches/series | 1 - 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93617f7..568bc92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sisu-ioc (2.3.0-8) UNRELEASED; urgency=medium + + * Team upload. + * Replaced guice_classifier.diff with a Maven rule + + -- Emmanuel Bourg <[email protected]> Thu, 17 Dec 2015 12:12:38 +0100 + sisu-ioc (2.3.0-7) unstable; urgency=medium * Team upload. diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 803a3a0..f238b10 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -14,6 +14,7 @@ # from the POM # junit junit jar s/3\\..*/3.x/ +org.sonatype.sisu sisu-guice * s/.*/debian/ no_aop * org.apache.maven.plugins maven-enforcer-plugin * * * * org.codehaus.mojo animal-sniffer-maven-plugin * * * * org.codehaus.mojo cobertura-maven-plugin * * * * diff --git a/debian/patches/guice_classifier.diff b/debian/patches/guice_classifier.diff deleted file mode 100644 index 75de074..0000000 --- a/debian/patches/guice_classifier.diff +++ /dev/null @@ -1,31 +0,0 @@ -Description: Remove <classifier>no_aop</classifier> from sisu-guice - dependency (default in Debian). -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed - -Index: b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -=================================================================== ---- a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -@@ -34,7 +34,7 @@ - <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> -- <classifier>no_aop</classifier> -+<!-- <classifier>no_aop</classifier> --> - <exclusions> - <exclusion> - <groupId>javax.inject</groupId> -Index: b/sisu-inject/pom.xml -=================================================================== ---- a/sisu-inject/pom.xml -+++ b/sisu-inject/pom.xml -@@ -49,7 +49,7 @@ - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> - <version>${sisu.guice.version}</version> -- <classifier>no_aop</classifier> -+<!-- <classifier>no_aop</classifier> --> - </dependency> - - </dependencies> diff --git a/debian/patches/series b/debian/patches/series index 3d653bf..ed63005 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ classworlds_compatibility.patch fix_osgi43.diff version_plexus.diff -guice_classifier.diff javac_apt_scanner.diff plexus-utils-compatibility.patch bnd-compatibility.patch -- 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
