[checkstyle] 04/08: refresh patches for upstream version 7.5.1
Tony Mancill
tmancill at moszumanska.debian.org
Wed Feb 15 05:54:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository checkstyle.
commit fe648f90a39ec9a31a65fa7e10cba50b71f2b126
Author: tony mancill <tmancill at debian.org>
Date: Tue Feb 14 21:22:36 2017 -0800
refresh patches for upstream version 7.5.1
---
debian/patches/01_link_to_system_javadocs.diff | 4 ++--
debian/patches/02_ignore_tests_requiring_internet_connectivity.diff | 2 +-
debian/patches/03_remove_maven3_prereq.diff | 2 +-
debian/patches/04_adjust_application_name.diff | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/01_link_to_system_javadocs.diff b/debian/patches/01_link_to_system_javadocs.diff
index a5f6f92..b24e9bd 100644
--- a/debian/patches/01_link_to_system_javadocs.diff
+++ b/debian/patches/01_link_to_system_javadocs.diff
@@ -5,9 +5,9 @@ Last-Update: 2011-07-19
--- a/pom.xml
+++ b/pom.xml
-@@ -323,7 +323,13 @@
+@@ -329,7 +329,13 @@
<configuration>
- <source>1.7</source>
+ <source>${java.version}</source>
<failOnError>true</failOnError>
- <linksource>true</linksource>
+ <linksource>false</linksource>
diff --git a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
index 35c36b6..1cd7127 100644
--- a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
+++ b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
@@ -5,7 +5,7 @@ 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
-@@ -65,6 +65,7 @@
+@@ -66,6 +66,7 @@
}
@Test
diff --git a/debian/patches/03_remove_maven3_prereq.diff b/debian/patches/03_remove_maven3_prereq.diff
index 41efec8..7358299 100644
--- a/debian/patches/03_remove_maven3_prereq.diff
+++ b/debian/patches/03_remove_maven3_prereq.diff
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -162,7 +162,7 @@
+@@ -169,7 +169,7 @@
</mailingLists>
<prerequisites>
diff --git a/debian/patches/04_adjust_application_name.diff b/debian/patches/04_adjust_application_name.diff
index e5db77b..df91220 100644
--- a/debian/patches/04_adjust_application_name.diff
+++ b/debian/patches/04_adjust_application_name.diff
@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
-@@ -404,8 +404,7 @@
- /** Prints the usage information. **/
+@@ -596,8 +596,7 @@
private static void printUsage() {
final HelpFormatter formatter = new HelpFormatter();
+ formatter.setWidth(HELP_WIDTH);
- formatter.printHelp(String.format("java %s [options] -c <config.xml> file...",
- Main.class.getName()), buildOptions());
+ formatter.printHelp("checkstyle [options] -c <config.xml> file...", buildOptions());
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/checkstyle.git
More information about the pkg-java-commits
mailing list