[jenkins] 02/02: Refreshed the patches

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jenkins.

commit 9130489138d6a9e59b1912e451e1aa6a66313f9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 7 16:43:07 2014 +0200

    Refreshed the patches
---
 debian/changelog                                        |  2 +-
 debian/maven.rules                                      |  2 +-
 debian/patches/build/0007-remove-findbugs.patch         |  2 +-
 debian/patches/native-integration/0011-purge-winp.patch | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 003b11f..9b0fba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jenkins (1.565.1-1) UNRELEASED; urgency=medium
+jenkins (1.565.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/maven.rules b/debian/maven.rules
index 0f25027..c642f7b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +22,7 @@ commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
 junit s/junit-dep/junit/ * s/.*/4.x/ * *
 junit junit * s/.*/4.x/ * *
 # Map onto exact version during build process
-org.jenkins-ci.main * * s/1\..*/1.565.1/ * *
+org.jenkins-ci.main * * s/1\..*/1.565.2/ * *
 # Handle plugin package
 org.kohsuke access-modifier-annotation jar s/.*/1.4/ * *
 org.kohsuke access-modifier-checker *  s/.*/1.4/ * *
diff --git a/debian/patches/build/0007-remove-findbugs.patch b/debian/patches/build/0007-remove-findbugs.patch
index fe57c0c..0f823da 100644
--- a/debian/patches/build/0007-remove-findbugs.patch
+++ b/debian/patches/build/0007-remove-findbugs.patch
@@ -224,7 +224,7 @@ Subject: remove-findbugs
          try {
 --- a/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
 +++ b/core/src/main/java/jenkins/model/lazy/LazyBuildMixIn.java
-@@ -168,7 +168,6 @@
+@@ -170,7 +170,6 @@
       * Suitable for {@link SubTask#createExecutable}.
       */
      @SuppressWarnings("SleepWhileHoldingLock")
diff --git a/debian/patches/native-integration/0011-purge-winp.patch b/debian/patches/native-integration/0011-purge-winp.patch
index 27bdde1..9023757 100644
--- a/debian/patches/native-integration/0011-purge-winp.patch
+++ b/debian/patches/native-integration/0011-purge-winp.patch
@@ -8,16 +8,16 @@ Subject: purge-winp
 
 --- a/core/src/main/java/hudson/util/ProcessTree.java
 +++ b/core/src/main/java/hudson/util/ProcessTree.java
-@@ -38,8 +38,6 @@
+@@ -37,8 +37,6 @@
+ import hudson.util.ProcessTree.OSProcess;
  import hudson.util.ProcessTreeRemoting.IOSProcess;
  import hudson.util.ProcessTreeRemoting.IProcessTree;
- import org.apache.commons.io.FileUtils;
 -import org.jvnet.winp.WinProcess;
 -import org.jvnet.winp.WinpException;
  
- import java.io.BufferedReader;
- import java.io.ByteArrayOutputStream;
-@@ -333,9 +331,6 @@
+ import java.io.*;
+ import java.lang.reflect.Field;
+@@ -324,9 +322,6 @@
              return DEFAULT;
  
          try {
@@ -27,7 +27,7 @@ Subject: purge-winp
              String os = Util.fixNull(System.getProperty("os.name"));
              if(os.equals("Linux"))
                  return new Linux();
-@@ -393,92 +388,6 @@
+@@ -384,92 +379,6 @@
      };
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git