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 bf3f5c061a71d8f75ca376ed09e25d2da6e63068 Author: Emmanuel Bourg <[email protected]> Date: Fri Oct 3 00:22:23 2014 +0200 Removed modules.diff --- debian/changelog | 1 + debian/maven.ignoreRules | 1 + debian/patches/modules.diff | 54 --------------------------------------------- debian/patches/series | 1 - 4 files changed, 2 insertions(+), 55 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97a907c..82f7ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ sisu-guice (3.2.3+dfsg-2) UNRELEASED; urgency=medium * Standards-Version updated to 3.9.6 (no changes) * Removed the unused build dependencies on the *-java-doc packages * Auto update the Built-Using field from the packages used at build time + * Removed modules.diff (not necessary with Maven rules) * Switch to debhelper level 9 * debian/copyright: Fixed the short name of the BSD-3-clause license diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 5872573..6798b4b 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,6 +1,7 @@ org.sonatype.sisu sisu-guice jar * tests test biz.aQute bnd * * * * +com.google.guava guava-testlib * * * * javax.inject javax.inject-tck * * * * org.apache.felix org.apache.felix.framework * * * * org.apache.maven.plugins maven-remote-resources-plugin * * * * diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff deleted file mode 100644 index b61e690..0000000 --- a/debian/patches/modules.diff +++ /dev/null @@ -1,54 +0,0 @@ -Description: removed some modules -Author: Eugene Zhukov <[email protected]> -Last-Update: 2014-08-21 - ---- sisu-guice-3.2.3+dfsg.orig/core/pom.xml -+++ sisu-guice-3.2.3+dfsg/core/pom.xml -@@ -56,11 +56,11 @@ - <artifactId>javax.inject-tck</artifactId> - <scope>test</scope> - </dependency> -- <dependency> -+ <!--dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <scope>test</scope> -- </dependency> -+ </dependency--> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> ---- sisu-guice-3.2.3+dfsg.orig/extensions/pom.xml -+++ sisu-guice-3.2.3+dfsg/extensions/pom.xml -@@ -17,7 +17,7 @@ - - <modules> - <module>assistedinject</module> -- <module>grapher</module> -+ <!--module>grapher</module> - <module>jmx</module> - <module>jndi</module> - <module>multibindings</module> -@@ -26,7 +26,7 @@ - <module>spring</module> - <module>struts2</module> - <module>testlib</module> -- <module>throwingproviders</module> -+ <module>throwingproviders</module--> - <!-- - | not yet promoted... - - - -@@ -59,11 +59,11 @@ - | Some extension tests depend on guava test libs which are not inherited - | from test scope. - --> -- <dependency> -+ <!--dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava-testlib</artifactId> - <scope>test</scope> -- </dependency> -+ </dependency--> - <!-- - | Some extension tests depend on cglib which is not embedded - | in an execution that doesn't include package. diff --git a/debian/patches/series b/debian/patches/series index 7435659..434db55 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ allow_maven2.diff -modules.diff asm3_compatible.patch -- 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
