This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guacamole-client.
commit b78a97b348023b72c8de0ce08169c476074324f9 Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 6 00:36:45 2016 +0100 Replaced 0002-guacamole-remove-missing-plugins.patch with Maven rules --- debian/changelog | 1 + debian/maven.ignoreRules | 3 + .../0002-guacamole-remove-missing-plugins.patch | 84 ---------------------- debian/patches/series | 1 - 4 files changed, 4 insertions(+), 85 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1384d7..b25d62f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ guacamole-client (0.8.3-1.2) UNRELEASED; urgency=medium * Transition to the Servlet API 3.1 (Closes: #801032) * Switch to debhelper level 9 * Build with the DH sequencer instead of CDBS + * Replaced 0002-guacamole-remove-missing-plugins.patch with Maven rules -- Emmanuel Bourg <[email protected]> Wed, 06 Jan 2016 00:00:54 +0100 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..8883bcc --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,3 @@ + +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/patches/0002-guacamole-remove-missing-plugins.patch b/debian/patches/0002-guacamole-remove-missing-plugins.patch deleted file mode 100644 index cafdcf9..0000000 --- a/debian/patches/0002-guacamole-remove-missing-plugins.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml -index a5b6223..c0918c2 100644 ---- a/guacamole-common/pom.xml -+++ b/guacamole-common/pom.xml -@@ -70,37 +70,6 @@ - </configuration> - </plugin> - -- <!-- Attach source jar --> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-source-plugin</artifactId> -- <executions> -- <execution> -- <id>attach-sources</id> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- -- <!-- Attach JavaDoc jar --> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-javadoc-plugin</artifactId> -- <configuration> -- <detectOfflineLinks>false</detectOfflineLinks> -- </configuration> -- <executions> -- <execution> -- <id>attach-javadocs</id> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- - </plugins> - </build> - -diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml -index 4ea7647..726062d 100644 ---- a/guacamole-ext/pom.xml -+++ b/guacamole-ext/pom.xml -@@ -70,37 +70,6 @@ - </configuration> - </plugin> - -- <!-- Attach source jar --> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-source-plugin</artifactId> -- <executions> -- <execution> -- <id>attach-sources</id> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- -- <!-- Attach JavaDoc jar --> -- <plugin> -- <groupId>org.apache.maven.plugins</groupId> -- <artifactId>maven-javadoc-plugin</artifactId> -- <configuration> -- <detectOfflineLinks>false</detectOfflineLinks> -- </configuration> -- <executions> -- <execution> -- <id>attach-javadocs</id> -- <goals> -- <goal>jar</goal> -- </goals> -- </execution> -- </executions> -- </plugin> -- - </plugins> - </build> - diff --git a/debian/patches/series b/debian/patches/series index 2c13e00..971ce84 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-guacamole-maven-debian-helper.patch -0002-guacamole-remove-missing-plugins.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guacamole-client.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
