[checkstyle] 02/05: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Oct 20 23:21:28 BST 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/5.9-1
in repository checkstyle.

commit 9869a4533e14936bc321330f6c97d457075437ea
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 20 23:27:41 2014 +0200

    Refreshed the patches
---
 debian/changelog                                               |  4 +++-
 debian/patches/01_link_to_system_javadocs.diff                 |  6 +++---
 .../02_ignore_tests_requiring_internet_connectivity.diff       | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3a10fc..c04996b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-checkstyle (5.7-3) UNRELEASED; urgency=medium
+checkstyle (5.9-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+  * Refreshed the patches
   * Standards-Version updated to 3.9.6 (no changes)
   * Moved the package to Git
 
diff --git a/debian/patches/01_link_to_system_javadocs.diff b/debian/patches/01_link_to_system_javadocs.diff
index 63bab05..8fca52b 100644
--- a/debian/patches/01_link_to_system_javadocs.diff
+++ b/debian/patches/01_link_to_system_javadocs.diff
@@ -5,10 +5,10 @@ Last-Update: 2011-07-19
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -461,6 +461,12 @@
-         <version>2.8</version>
-         <configuration>
+@@ -443,6 +443,12 @@
            <source>1.5</source>
+ 	  <failOnError>false</failOnError>
+ 	  <linksource>true</linksource>
 +          <offlineLinks>
 +            <offlineLink>
 +              <url>file:///usr/share/doc/default-jdk-doc/api/</url>
diff --git a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
index 5d4146a..dd41a35 100644
--- a/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
+++ b/debian/patches/02_ignore_tests_requiring_internet_connectivity.diff
@@ -3,13 +3,13 @@ Description: Disables the tests requiring an Internet connectivity
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 Bug-Debian: http://bugs.debian.org/714109
---- a/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
-+++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
-@@ -56,6 +56,7 @@
+--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
++++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+@@ -57,6 +57,7 @@
      }
  
      @Test
 +    @org.junit.Ignore
-     public void testLoadFromURL() throws CheckstyleException
+     public void testLoadFromURL()
+         throws CheckstyleException, InterruptedException
      {
-         final FilterSet fc = SuppressionsLoader.loadSuppressions("https://raw.github.com/checkstyle/checkstyle/master/src/testinputs/com/puppycrawl/tools/checkstyle/suppressions_none.xml");

-- 
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