[SCM] jenkins packaging branch, master, updated. debian/1.480.3+dfsg-1_exp1-10-g622bbac

[James Page]

The following commit has been merged in the master branch:
commit d51d5c8b5ba38392f4f9e6815ccf389d2674b888
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jul 2 13:41:30 2013 +0100

    Fixup compatibility with new versions of dependencies:
    
    * Fixup compatibility with new versions of dependencies:
      - d/p/build/fileupload-compat.patch: Compatibility patch for
        commons-fileupload >= 1.3.
      - d/p/build/io-compat.pach: Compatibility patch for commons-io >= 2.4.
      - d/control: Add versioned dependencies for the above patches.

diff --git a/debian/changelog b/debian/changelog
index a1f2007..5f4ae43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ jenkins (1.480.3+dfsg-1) unstable; urgency=low
     for http and ajp connections (Closes: #684586), listen on 127.0.0.1
     by default to allow installs to be secured before wider access
     (Closes: #675233).
+  * Fixup compatibility with new versions of dependencies:
+    - d/p/build/fileupload-compat.patch: Compatibility patch for
+      commons-fileupload >= 1.3.
+    - d/p/build/io-compat.pach: Compatibility patch for commons-io >= 2.4.
+    - d/control: Add versioned dependencies for the above patches.
 
  -- James Page <james.page at ubuntu.com>  Tue, 02 Jul 2013 11:38:50 +0100
 
diff --git a/debian/control b/debian/control
index e916048..65433af 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,9 @@ Build-Depends-Indep:
  libcommons-codec-java,
  libcommons-collections3-java,
  libcommons-digester-java,
+ libcommons-fileupload-java (>= 1.3),
  libcommons-httpclient-java,
- libcommons-io-java,
+ libcommons-io-java (>= 2.4),
  libcommons-lang-java,
  libcommons-logging-java,
  libjaxen-java,
@@ -257,7 +258,7 @@ Architecture: all
 Depends:
  ant,
  default-jre-headless | java6-runtime-headless,
- libcommons-io-java,
+ libcommons-io-java (>= 2.4),
  libcommons-lang-java,
  libjenkins-remoting-java (>= 2.22),
  libjenkins-xstream-java,
diff --git a/debian/patches/build/fileupload-compat.patch b/debian/patches/build/fileupload-compat.patch
new file mode 100644
index 0000000..d4f753f
--- /dev/null
+++ b/debian/patches/build/fileupload-compat.patch
@@ -0,0 +1,27 @@
+Description: Compatibility patch for Commons FileUpload
+ Debian/Ubuntu ships a later version of commons-fileupload
+ .
+ This patch provides compatibility only.
+Author: james.page at ubuntu.com
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/core/src/main/java/hudson/model/FileParameterValue.java
++++ b/core/src/main/java/hudson/model/FileParameterValue.java
+@@ -40,6 +40,7 @@ import javax.servlet.ServletException;
+ 
+ import org.apache.commons.fileupload.FileItem;
+ import org.apache.commons.fileupload.disk.DiskFileItem;
++import org.apache.commons.fileupload.FileItemHeaders;
+ import org.apache.commons.io.FilenameUtils;
+ import org.apache.commons.io.IOUtils;
+ import org.apache.commons.lang.StringUtils;
+@@ -277,5 +278,8 @@ public class FileParameterValue extends
+         public OutputStream getOutputStream() throws IOException {
+             return new FileOutputStream(file);
+         }
++
++        public void setHeaders(FileItemHeaders headers) {
++        }
+     }
+ }
diff --git a/debian/patches/build/io-compat.pach b/debian/patches/build/io-compat.pach
new file mode 100644
index 0000000..e3b53c9
--- /dev/null
+++ b/debian/patches/build/io-compat.pach
@@ -0,0 +1,28 @@
+Description: Compatibility patch with commons-io >= 2.4
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/core/src/main/java/hudson/util/IOUtils.java
++++ b/core/src/main/java/hudson/util/IOUtils.java
+@@ -76,16 +76,18 @@ public class IOUtils extends org.apache.
+      *
+      * @since 1.349
+      */
+-    public static InputStream skip(InputStream in, long size) throws IOException {
++    public static long skip(InputStream in, long size) throws IOException {
+         DataInputStream di = new DataInputStream(in);
++        long skipped = 0;
+ 
+         while (size>0) {
+             int chunk = (int)Math.min(SKIP_BUFFER.length,size);
+             di.readFully(SKIP_BUFFER,0,chunk);
+             size -= chunk;
++            skipped += chunk;
+         }
+ 
+-        return in;
++        return skipped;
+     }
+ 
+     /**
diff --git a/debian/patches/series b/debian/patches/series
index 331e847..cdabed7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,5 @@ ubuntu/ubuntu-font.patch
 build/use-stock-asm3.patch
 build/use-debian-jbcrypt.patch
 build/ignore-plugin-pom.xml
+build/fileupload-compat.patch
+build/io-compat.pach

-- 
jenkins packaging