The following commit has been merged in the master branch:
commit 11959e14d172a89cb3aaec48c3d967e70ef4d307
Author: James Page <james.p...@ubuntu.com>
Date:   Tue Feb 28 16:50:53 2012 +0000

    Refreshed patches:
    
    * Refreshed patches:
      - Dropped disable-avalon-frawework.patch - no longer required.

diff --git a/debian/changelog b/debian/changelog
index d619990..4ee9ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jenkins (1.424.3+dfsg-1) unstable; urgency=low
 
   * New upstream bugfix release.
+  * Refreshed patches:
+    - Dropped disable-avalon-frawework.patch - no longer required.
   * Enable use of jenkins-instance-identity and jenkins-ssh-cli-auth to 
     support use of public/private keypairs when using the jenkins remote
     cli tool. 
@@ -11,7 +13,7 @@ jenkins (1.424.3+dfsg-1) unstable; urgency=low
     the jenkins user to help deal with transition from upstream packaging 
     (Closes: #661203).
 
- -- James Page <james.p...@ubuntu.com>  Tue, 28 Feb 2012 16:46:30 +0000
+ -- James Page <james.p...@ubuntu.com>  Tue, 28 Feb 2012 16:49:57 +0000
 
 jenkins (1.424.2+dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/build/apt-stapler-processing.patch 
b/debian/patches/build/apt-stapler-processing.patch
index d3e2e57..0d39fc7 100644
--- a/debian/patches/build/apt-stapler-processing.patch
+++ b/debian/patches/build/apt-stapler-processing.patch
@@ -10,9 +10,9 @@ Forwarded: not-needed
 
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:32.864316397 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:34.520316354 +0000
-@@ -573,6 +573,24 @@
+--- jenkins.orig/core/pom.xml  2012-02-28 16:48:34.425690522 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:49:08.125793192 +0000
+@@ -562,6 +562,24 @@
          </executions>
        </plugin>
        <plugin>
diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch
index 3d8a2ae..859258b 100644
--- a/debian/patches/build/build.patch
+++ b/debian/patches/build/build.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
 
 Index: jenkins/pom.xml
 ===================================================================
---- jenkins.orig/pom.xml       2012-01-31 10:35:19.684316727 +0000
-+++ jenkins/pom.xml    2012-01-31 10:35:32.864316397 +0000
+--- jenkins.orig/pom.xml       2012-02-28 16:48:20.877649207 +0000
++++ jenkins/pom.xml    2012-02-28 16:48:34.425690522 +0000
 @@ -48,10 +48,7 @@
  
    <modules>
@@ -19,9 +19,9 @@ Index: jenkins/pom.xml
  
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:19.708316726 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:32.864316397 +0000
-@@ -285,6 +285,16 @@
+--- jenkins.orig/core/pom.xml  2012-02-28 16:48:20.889649243 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:48:34.425690522 +0000
+@@ -274,6 +274,16 @@
        <groupId>commons-jelly</groupId>
        <artifactId>commons-jelly-tags-fmt</artifactId>
        <version>1.0</version>
diff --git a/debian/patches/build/disable-avalon-frawework.patch 
b/debian/patches/build/disable-avalon-frawework.patch
deleted file mode 100644
index 9bec7f9..0000000
--- a/debian/patches/build/disable-avalon-frawework.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Removes un-needed dependency on Avalnon framework. Not
- use in code so suspect its left over cruft.
-Author: James Page <james.p...@ubuntu.com>
-Forwarded: no
-
-Index: jenkins/core/src/main/java/hudson/util/DescribableList.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/DescribableList.java   
2012-01-31 10:35:19.540316731 +0000
-+++ jenkins/core/src/main/java/hudson/util/DescribableList.java        
2012-01-31 10:35:33.408316383 +0000
-@@ -39,7 +39,6 @@
- import hudson.model.ReconfigurableDescribable;
- import hudson.model.Saveable;
- import net.sf.json.JSONObject;
--import org.apache.avalon.framework.configuration.Reconfigurable;
- import org.kohsuke.stapler.StaplerRequest;
- 
- import java.io.IOException;
diff --git a/debian/patches/build/openjdk6.patch 
b/debian/patches/build/openjdk6.patch
index 619e644..079024a 100644
--- a/debian/patches/build/openjdk6.patch
+++ b/debian/patches/build/openjdk6.patch
@@ -6,9 +6,9 @@ Forwarded: 
https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959
 
 Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java    
2012-01-31 10:35:19.484316732 +0000
-+++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-01-31 
10:35:33.684316375 +0000
-@@ -1186,4 +1186,13 @@
+--- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java    
2012-02-28 16:46:08.813245244 +0000
++++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-02-28 
16:48:39.265705276 +0000
+@@ -1196,4 +1196,13 @@
      }
  
      private static final Logger LOGGER = 
Logger.getLogger(AbstractBuild.class.getName());
@@ -24,8 +24,8 @@ Index: 
jenkins/core/src/main/java/hudson/model/AbstractBuild.java
  }
 Index: jenkins/core/src/main/java/hudson/DescriptorExtensionList.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/DescriptorExtensionList.java        
2012-01-31 10:35:19.464316733 +0000
-+++ jenkins/core/src/main/java/hudson/DescriptorExtensionList.java     
2012-01-31 10:35:33.684316375 +0000
+--- jenkins.orig/core/src/main/java/hudson/DescriptorExtensionList.java        
2012-02-10 15:39:22.665867336 +0000
++++ jenkins/core/src/main/java/hudson/DescriptorExtensionList.java     
2012-02-28 16:48:39.265705276 +0000
 @@ -79,8 +79,9 @@
       * @deprecated as of 1.416
       *      Use {@link #create(Jenkins, Class)}
diff --git a/debian/patches/build/remove-licensing-report.patch 
b/debian/patches/build/remove-licensing-report.patch
index a890438..8c41b59 100644
--- a/debian/patches/build/remove-licensing-report.patch
+++ b/debian/patches/build/remove-licensing-report.patch
@@ -5,8 +5,8 @@ Forwarded: not-needed
 
 Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
 ===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.jelly       
2012-01-31 10:35:19.420316734 +0000
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly    
2012-01-31 10:35:33.968316369 +0000
+--- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.jelly       
2012-02-10 15:39:22.749867338 +0000
++++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly    
2012-02-28 16:48:45.517724331 +0000
 @@ -31,13 +31,6 @@
        <p>
          ${%blurb}
@@ -23,8 +23,8 @@ Index: 
jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
  </j:jelly>
 Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties
 ===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.properties  
2012-01-31 10:35:19.400316734 +0000
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties       
2012-01-31 10:35:33.968316369 +0000
+--- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.properties  
2012-02-10 15:39:22.749867338 +0000
++++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties       
2012-02-28 16:48:45.517724331 +0000
 @@ -20,7 +20,7 @@
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  # THE SOFTWARE.
diff --git a/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch 
b/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch
index 6b60fac..fc98c21 100644
--- a/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch
+++ b/debian/patches/dependency-upgrades/animal-sniffer-upgrade.patch
@@ -5,8 +5,8 @@ Forwarded: 
https://github.com/jenkinsci/jenkins/commit/dd8cdda6eeb4a29d991a61d58
 
 Index: jenkins/core/src/main/java/hudson/Functions.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/Functions.java      2012-01-31 
10:35:18.596316754 +0000
-+++ jenkins/core/src/main/java/hudson/Functions.java   2012-01-31 
10:35:37.188316288 +0000
+--- jenkins.orig/core/src/main/java/hudson/Functions.java      2012-02-10 
15:39:22.669867336 +0000
++++ jenkins/core/src/main/java/hudson/Functions.java   2012-02-28 
16:49:18.501824775 +0000
 @@ -63,7 +63,7 @@
  import org.apache.commons.jelly.XMLOutput;
  import org.apache.commons.jexl.parser.ASTSizeFunction;
@@ -18,8 +18,8 @@ Index: jenkins/core/src/main/java/hudson/Functions.java
  import org.kohsuke.stapler.Stapler;
 Index: jenkins/core/src/main/java/hudson/Util.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/Util.java   2012-01-31 
10:35:18.604316753 +0000
-+++ jenkins/core/src/main/java/hudson/Util.java        2012-01-31 
10:35:37.188316288 +0000
+--- jenkins.orig/core/src/main/java/hudson/Util.java   2012-02-10 
15:39:22.673867336 +0000
++++ jenkins/core/src/main/java/hudson/Util.java        2012-02-28 
16:49:18.505824788 +0000
 @@ -42,7 +42,7 @@
  import org.jruby.ext.posix.FileStat;
  import org.jruby.ext.posix.POSIX;
@@ -31,8 +31,8 @@ Index: jenkins/core/src/main/java/hudson/Util.java
  import javax.crypto.spec.SecretKeySpec;
 Index: 
jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java
 ===================================================================
---- 
jenkins.orig/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java
   2012-01-31 10:35:18.640316752 +0000
-+++ 
jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java     
   2012-01-31 10:35:37.188316288 +0000
+--- 
jenkins.orig/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java
   2012-02-10 15:39:22.677867336 +0000
++++ 
jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.java     
   2012-02-28 16:49:18.505824788 +0000
 @@ -26,7 +26,7 @@
  import hudson.Extension;
  import jenkins.model.Jenkins;
@@ -44,8 +44,8 @@ Index: 
jenkins/core/src/main/java/hudson/diagnosis/HudsonHomeDiskUsageChecker.ja
  
 Index: jenkins/core/src/main/java/hudson/model/ExternalRun.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/model/ExternalRun.java      
2012-01-31 10:35:18.616316754 +0000
-+++ jenkins/core/src/main/java/hudson/model/ExternalRun.java   2012-01-31 
10:35:37.188316288 +0000
+--- jenkins.orig/core/src/main/java/hudson/model/ExternalRun.java      
2012-02-10 15:39:22.693867337 +0000
++++ jenkins/core/src/main/java/hudson/model/ExternalRun.java   2012-02-28 
16:49:18.505824788 +0000
 @@ -26,7 +26,7 @@
  import hudson.Proc;
  import hudson.util.DecodingStream;
@@ -57,8 +57,8 @@ Index: 
jenkins/core/src/main/java/hudson/model/ExternalRun.java
  import javax.xml.stream.XMLStreamException;
 Index: 
jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
 ===================================================================
---- 
jenkins.orig/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
       2012-01-31 10:35:18.624316754 +0000
-+++ 
jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java 
   2012-01-31 10:35:37.188316288 +0000
+--- 
jenkins.orig/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java
       2012-02-10 15:39:22.709867337 +0000
++++ 
jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescriptor.java 
   2012-02-28 16:49:18.505824788 +0000
 @@ -29,7 +29,7 @@
  import hudson.Util;
  import hudson.slaves.OfflineCause;
@@ -70,8 +70,8 @@ Index: 
jenkins/core/src/main/java/hudson/node_monitors/DiskSpaceMonitorDescripto
  import java.io.IOException;
 Index: 
jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java
 ===================================================================
---- 
jenkins.orig/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 
   2012-01-31 10:35:18.632316753 +0000
-+++ jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 
2012-01-31 10:35:37.188316288 +0000
+--- 
jenkins.orig/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 
   2012-02-10 15:39:22.709867337 +0000
++++ jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.java 
2012-02-28 16:49:18.505824788 +0000
 @@ -31,7 +31,7 @@
  import jenkins.model.Jenkins;
  import hudson.node_monitors.DiskSpaceMonitorDescriptor.DiskSpace;
@@ -83,8 +83,8 @@ Index: 
jenkins/core/src/main/java/hudson/node_monitors/TemporarySpaceMonitor.jav
  import java.io.File;
 Index: 
jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
 ===================================================================
---- 
jenkins.orig/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
    2012-01-31 10:35:18.668316753 +0000
-+++ 
jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
 2012-01-31 10:35:37.188316288 +0000
+--- 
jenkins.orig/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
    2012-02-10 15:39:22.713867337 +0000
++++ 
jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityRealm.java
 2012-02-28 16:49:18.509824800 +0000
 @@ -16,7 +16,7 @@
  import org.acegisecurity.userdetails.UserDetails;
  import org.acegisecurity.userdetails.UserDetailsService;
@@ -96,8 +96,8 @@ Index: 
jenkins/core/src/main/java/hudson/security/AbstractPasswordBasedSecurityR
  import org.springframework.web.context.WebApplicationContext;
 Index: jenkins/core/src/main/java/hudson/tools/ZipExtractionInstaller.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/tools/ZipExtractionInstaller.java   
2012-01-31 10:35:18.652316753 +0000
-+++ jenkins/core/src/main/java/hudson/tools/ZipExtractionInstaller.java        
2012-01-31 10:35:37.188316288 +0000
+--- jenkins.orig/core/src/main/java/hudson/tools/ZipExtractionInstaller.java   
2012-02-10 15:39:22.733867337 +0000
++++ jenkins/core/src/main/java/hudson/tools/ZipExtractionInstaller.java        
2012-02-28 16:49:18.509824800 +0000
 @@ -45,7 +45,7 @@
  import java.net.URLConnection;
  import org.kohsuke.stapler.DataBoundConstructor;
diff --git a/debian/patches/dependency-upgrades/asm3-upgrade.patch 
b/debian/patches/dependency-upgrades/asm3-upgrade.patch
index 51e110c..8f5a49c 100644
--- a/debian/patches/dependency-upgrades/asm3-upgrade.patch
+++ b/debian/patches/dependency-upgrades/asm3-upgrade.patch
@@ -6,8 +6,8 @@ Forwarded: no
 
 Index: jenkins/core/src/main/java/hudson/util/SubClassGenerator.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/SubClassGenerator.java 
2012-01-31 10:35:18.708316752 +0000
-+++ jenkins/core/src/main/java/hudson/util/SubClassGenerator.java      
2012-01-31 10:35:36.912316294 +0000
+--- jenkins.orig/core/src/main/java/hudson/util/SubClassGenerator.java 
2012-02-10 15:39:22.741867338 +0000
++++ jenkins/core/src/main/java/hudson/util/SubClassGenerator.java      
2012-02-28 16:49:17.545821866 +0000
 @@ -44,7 +44,7 @@
      }
  
diff --git a/debian/patches/dependency-upgrades/groovy-upgrade.patch 
b/debian/patches/dependency-upgrades/groovy-upgrade.patch
index 9b695f7..db7ad57 100644
--- a/debian/patches/dependency-upgrades/groovy-upgrade.patch
+++ b/debian/patches/dependency-upgrades/groovy-upgrade.patch
@@ -5,9 +5,9 @@ Forwarded: not-needed
 
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:36.104316316 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:36.356316308 +0000
-@@ -376,6 +376,16 @@
+--- jenkins.orig/core/pom.xml  2012-02-28 16:49:10.609800755 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:49:15.769816461 +0000
+@@ -365,6 +365,16 @@
        <version>1.6.0</version>
      </dependency>
      <dependency>
diff --git a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch 
b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
index e54d2cc..07ae616 100644
--- a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
@@ -5,8 +5,8 @@ Forwarded: not-needed
 
 Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixAPI.java    2012-01-31 
10:35:18.760316749 +0000
-+++ jenkins/core/src/main/java/hudson/os/PosixAPI.java 2012-01-31 
10:35:36.612316303 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/PosixAPI.java    2012-02-10 
15:39:22.709867337 +0000
++++ jenkins/core/src/main/java/hudson/os/PosixAPI.java 2012-02-28 
16:49:16.617819042 +0000
 @@ -1,10 +1,9 @@
  package hudson.os;
  
@@ -44,8 +44,8 @@ Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
          public File getCurrentWorkingDirectory() {
 Index: jenkins/core/src/main/java/hudson/os/PosixException.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixException.java      
2012-01-31 10:35:18.780316750 +0000
-+++ jenkins/core/src/main/java/hudson/os/PosixException.java   2012-01-31 
10:35:36.612316303 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/PosixException.java      
2012-02-10 15:39:22.709867337 +0000
++++ jenkins/core/src/main/java/hudson/os/PosixException.java   2012-02-28 
16:49:16.617819042 +0000
 @@ -1,6 +1,6 @@
  package hudson.os;
  
@@ -74,8 +74,8 @@ Index: 
jenkins/core/src/main/java/hudson/os/PosixException.java
  
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:36.356316308 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:36.612316303 +0000
+--- jenkins.orig/core/pom.xml  2012-02-28 16:49:15.769816461 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:49:16.617819042 +0000
 @@ -86,6 +86,11 @@
        <version>1.0.3</version>
      </dependency>
diff --git a/debian/patches/native-integration/filter-native-integrations.patch 
b/debian/patches/native-integration/filter-native-integrations.patch
index b3a66d7..fba186a 100644
--- a/debian/patches/native-integration/filter-native-integrations.patch
+++ b/debian/patches/native-integration/filter-native-integrations.patch
@@ -1,8 +1,8 @@
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:34.780316349 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:35.048316342 +0000
-@@ -598,6 +598,17 @@
+--- jenkins.orig/core/pom.xml  2012-02-28 16:49:09.501797382 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:49:10.609800755 +0000
+@@ -587,6 +587,17 @@
          <configuration>
            <fork>${staplerFork}</fork><!-- the source code is big enough now 
that otherwise it fails with OutOfMemoryError -->
            <maxmem>128m</maxmem>
diff --git a/debian/patches/native-integration/purge-embedded-su4j.patch 
b/debian/patches/native-integration/purge-embedded-su4j.patch
index 6a6a90b..a291269 100644
--- a/debian/patches/native-integration/purge-embedded-su4j.patch
+++ b/debian/patches/native-integration/purge-embedded-su4j.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
 
 Index: jenkins/core/src/main/java/hudson/os/SU.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/SU.java  2012-01-31 
10:35:19.076316741 +0000
-+++ jenkins/core/src/main/java/hudson/os/SU.java       2012-01-31 
10:35:35.320316334 +0000
+--- jenkins.orig/core/src/main/java/hudson/os/SU.java  2012-02-10 
15:39:22.709867337 +0000
++++ jenkins/core/src/main/java/hudson/os/SU.java       2012-02-28 
16:49:11.729804164 +0000
 @@ -23,7 +23,6 @@
   */
  package hudson.os;
diff --git a/debian/patches/native-integration/purge-windows-support.patch 
b/debian/patches/native-integration/purge-windows-support.patch
index b52e88c..00fd79b 100644
--- a/debian/patches/native-integration/purge-windows-support.patch
+++ b/debian/patches/native-integration/purge-windows-support.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
 
 Index: jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/slaves/SlaveComputer.java   
2012-01-31 10:35:18.996316743 +0000
-+++ jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java        
2012-01-31 10:35:35.840316321 +0000
+--- jenkins.orig/core/src/main/java/hudson/slaves/SlaveComputer.java   
2012-02-10 15:39:22.725867337 +0000
++++ jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java        
2012-02-28 16:49:14.885813770 +0000
 @@ -34,7 +34,6 @@
  import hudson.util.RingBufferLogHandler;
  import hudson.util.Futures;
diff --git a/debian/patches/native-integration/purge-winp.patch 
b/debian/patches/native-integration/purge-winp.patch
index f8cffdc..cf92673 100644
--- a/debian/patches/native-integration/purge-winp.patch
+++ b/debian/patches/native-integration/purge-winp.patch
@@ -5,8 +5,8 @@ Forwarded: not-needed
 
 Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
 ===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/ProcessTree.java       
2012-01-31 10:35:19.036316742 +0000
-+++ jenkins/core/src/main/java/hudson/util/ProcessTree.java    2012-01-31 
10:35:35.580316329 +0000
+--- jenkins.orig/core/src/main/java/hudson/util/ProcessTree.java       
2012-02-10 15:39:22.741867338 +0000
++++ jenkins/core/src/main/java/hudson/util/ProcessTree.java    2012-02-28 
16:49:13.945810909 +0000
 @@ -37,8 +37,6 @@
  import hudson.util.ProcessTreeRemoting.IOSProcess;
  import hudson.util.ProcessTreeRemoting.IProcessTree;
diff --git a/debian/patches/native-integration/windows-service-disable.patch 
b/debian/patches/native-integration/windows-service-disable.patch
index 481d3f3..019ac64 100644
--- a/debian/patches/native-integration/windows-service-disable.patch
+++ b/debian/patches/native-integration/windows-service-disable.patch
@@ -4,9 +4,9 @@ Forwarded: not-needed
 
 Index: jenkins/core/pom.xml
 ===================================================================
---- jenkins.orig/core/pom.xml  2012-01-31 10:35:34.520316354 +0000
-+++ jenkins/core/pom.xml       2012-01-31 10:35:34.780316349 +0000
-@@ -655,32 +655,6 @@
+--- jenkins.orig/core/pom.xml  2012-02-28 16:49:08.125793192 +0000
++++ jenkins/core/pom.xml       2012-02-28 16:49:09.501797382 +0000
+@@ -644,32 +644,6 @@
            </execution>
          </executions>
        </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index af02d0b..47e74e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 build/build.patch
-build/disable-avalon-frawework.patch
 build/openjdk6.patch
 build/remove-licensing-report.patch
 build/disable-plugins.patch
diff --git a/debian/patches/ubuntu/ubuntu-font.patch 
b/debian/patches/ubuntu/ubuntu-font.patch
index 6bd4def..3bd531a 100644
--- a/debian/patches/ubuntu/ubuntu-font.patch
+++ b/debian/patches/ubuntu/ubuntu-font.patch
@@ -4,8 +4,8 @@ Forwarded: not-needed
 
 Index: jenkins/war/src/main/webapp/css/style.css
 ===================================================================
---- jenkins.orig/war/src/main/webapp/css/style.css     2012-01-31 
10:35:18.568316756 +0000
-+++ jenkins/war/src/main/webapp/css/style.css  2012-01-31 10:35:37.608316278 
+0000
+--- jenkins.orig/war/src/main/webapp/css/style.css     2012-02-10 
15:39:23.029867344 +0000
++++ jenkins/war/src/main/webapp/css/style.css  2012-02-28 16:49:19.749828573 
+0000
 @@ -29,7 +29,7 @@
  
  body, table, form, input, td, th, p, textarea, select

-- 
jenkins packaging

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to