This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository checkstyle.
commit 64916c99bd4a2d1298abeb221612b20be1d7a515 Author: tony mancill <[email protected]> Date: Sun Feb 11 11:19:36 2018 -0800 Freshen patches for upstream release 8.8 --- debian/patches/01_link_to_system_javadocs.diff | 8 +++++--- .../02_ignore_tests_requiring_internet_connectivity.diff | 8 +++++--- debian/patches/03_remove_maven3_prereq.diff | 14 -------------- debian/patches/04_adjust_application_name.diff | 8 +++++--- debian/patches/series | 1 - 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/debian/patches/01_link_to_system_javadocs.diff b/debian/patches/01_link_to_system_javadocs.diff index b24e9bd..dac16c2 100644 --- a/debian/patches/01_link_to_system_javadocs.diff +++ b/debian/patches/01_link_to_system_javadocs.diff @@ -3,9 +3,11 @@ Author: Miguel Landaeta <[email protected]> Forwarded: no Last-Update: 2011-07-19 ---- a/pom.xml -+++ b/pom.xml -@@ -329,7 +329,13 @@ +Index: checkstyle/pom.xml +=================================================================== +--- checkstyle.orig/pom.xml ++++ checkstyle/pom.xml +@@ -389,7 +389,13 @@ <configuration> <source>${java.version}</source> <failOnError>true</failOnError> diff --git a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff index 1cd7127..011b4df 100644 --- a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff +++ b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff @@ -3,9 +3,11 @@ Description: Disables the tests requiring an Internet connectivity Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed Bug-Debian: http://bugs.debian.org/714109 ---- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java -+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java -@@ -66,6 +66,7 @@ +Index: checkstyle/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +=================================================================== +--- checkstyle.orig/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java ++++ checkstyle/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java +@@ -71,6 +71,7 @@ public class SuppressionsLoaderTest exte } @Test diff --git a/debian/patches/03_remove_maven3_prereq.diff b/debian/patches/03_remove_maven3_prereq.diff deleted file mode 100644 index 7358299..0000000 --- a/debian/patches/03_remove_maven3_prereq.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Remove the prerequisite on Maven 3 -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/pom.xml -+++ b/pom.xml -@@ -169,7 +169,7 @@ - </mailingLists> - - <prerequisites> -- <maven>3.0.1</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <scm> diff --git a/debian/patches/04_adjust_application_name.diff b/debian/patches/04_adjust_application_name.diff index df91220..ef80504 100644 --- a/debian/patches/04_adjust_application_name.diff +++ b/debian/patches/04_adjust_application_name.diff @@ -1,9 +1,11 @@ Description: Display the name of the application instead of the class name in the help message Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed ---- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java -+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java -@@ -596,8 +596,7 @@ +Index: checkstyle/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +=================================================================== +--- checkstyle.orig/src/main/java/com/puppycrawl/tools/checkstyle/Main.java ++++ checkstyle/src/main/java/com/puppycrawl/tools/checkstyle/Main.java +@@ -696,8 +696,7 @@ public final class Main { private static void printUsage() { final HelpFormatter formatter = new HelpFormatter(); formatter.setWidth(HELP_WIDTH); diff --git a/debian/patches/series b/debian/patches/series index 88f00ca..230c375 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01_link_to_system_javadocs.diff 02_ignore_tests_requiring_internet_connectivity.diff -03_remove_maven3_prereq.diff 04_adjust_application_name.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/checkstyle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
