This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-vfs.
commit faf5403f800fa26407a513d44d63c7e3acea4ae7 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 7 00:31:45 2016 +0200 Refreshed the patches --- debian/changelog | 4 +- debian/libcommons-vfs-java.poms | 2 +- debian/patches/disable_webdav_provider.diff | 73 ++++++++++++++--------------- debian/patches/series | 1 - debian/patches/skip_examples.diff | 20 -------- 5 files changed, 38 insertions(+), 62 deletions(-) diff --git a/debian/changelog b/debian/changelog index d401189..ae9c6e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -commons-vfs (2.0-8) UNRELEASED; urgency=medium +commons-vfs (2.1-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * Moved the package to Git * Standards-Version updated to 3.9.8 diff --git a/debian/libcommons-vfs-java.poms b/debian/libcommons-vfs-java.poms index 30bacff..f75bf6a 100644 --- a/debian/libcommons-vfs-java.poms +++ b/debian/libcommons-vfs-java.poms @@ -1,4 +1,4 @@ pom.xml -examples/pom.xml +examples/pom.xml --ignore core/pom.xml --java-lib dist/pom.xml --ignore diff --git a/debian/patches/disable_webdav_provider.diff b/debian/patches/disable_webdav_provider.diff index 399863f..a09c60d 100644 --- a/debian/patches/disable_webdav_provider.diff +++ b/debian/patches/disable_webdav_provider.diff @@ -1,54 +1,49 @@ Description: Disable webdav module (source code build and javadoc package) because jackrabbit JCR provider is not yet in Debian. Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2011-09-11 Forwarded: not-needed -Index: b/core/pom.xml -=================================================================== --- a/core/pom.xml +++ b/core/pom.xml -@@ -167,6 +167,36 @@ - </configuration> - </plugin> +@@ -207,6 +207,36 @@ -+ <plugin> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> -+ <executions> -+ <execution> -+ <id>default-compile</id> -+ <phase>compile</phase> -+ <configuration> -+ <excludes> -+ <exclude>**/webdav/*</exclude> -+ </excludes> -+ </configuration> -+ <goals> -+ <goal>compile</goal> -+ </goals> -+ </execution> -+ <execution> -+ <id>default-testCompile</id> -+ <phase>test-compile</phase> -+ <configuration> -+ <testExcludes> -+ <exclude>**/webdav/test/*</exclude> -+ </testExcludes> -+ </configuration> -+ <goals> -+ <goal>testCompile</goal> -+ </goals> -+ </execution> -+ </executions> ++ <executions> ++ <execution> ++ <id>default-compile</id> ++ <phase>compile</phase> ++ <configuration> ++ <excludes> ++ <exclude>**/webdav/*</exclude> ++ </excludes> ++ </configuration> ++ <goals> ++ <goal>compile</goal> ++ </goals> ++ </execution> ++ <execution> ++ <id>default-testCompile</id> ++ <phase>test-compile</phase> ++ <configuration> ++ <testExcludes> ++ <exclude>**/webdav/test/*</exclude> ++ </testExcludes> ++ </configuration> ++ <goals> ++ <goal>testCompile</goal> ++ </goals> ++ </execution> ++ </executions> + </plugin> + - </plugins> - </build> - <profiles> -Index: b/pom.xml -=================================================================== ++ <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> --- a/pom.xml +++ b/pom.xml -@@ -243,6 +243,7 @@ +@@ -294,6 +294,7 @@ </tag> </tags> <aggregate>true</aggregate> diff --git a/debian/patches/series b/debian/patches/series index 48211a1..c5685c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ disable_webdav_provider.diff -skip_examples.diff diff --git a/debian/patches/skip_examples.diff b/debian/patches/skip_examples.diff deleted file mode 100644 index 179f44c..0000000 --- a/debian/patches/skip_examples.diff +++ /dev/null @@ -1,20 +0,0 @@ -Description: Disable examples module. -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2011-09-11 -Forwarded: not-needed - -Index: b/pom.xml -=================================================================== ---- a/pom.xml -+++ b/pom.xml -@@ -38,8 +38,10 @@ - - <modules> - <module>core</module> -+<!-- - <module>examples</module> - <module>dist</module> -+--> - </modules> - - <issueManagement> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-vfs.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
