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

James Page james.page at ubuntu.com
Tue Jul 2 13:32:26 UTC 2013


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

    Add getHeaders to fileupload patch

diff --git a/.gitignore b/.gitignore
index 66394a9..82ee5e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ jenkins_*.build
 jenkins_*.changes
 *.deb
 push-build.sh
+
+.pc
diff --git a/debian/patches/build/fileupload-compat.patch b/debian/patches/build/fileupload-compat.patch
index d4f753f..76107df 100644
--- a/debian/patches/build/fileupload-compat.patch
+++ b/debian/patches/build/fileupload-compat.patch
@@ -16,12 +16,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  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
+@@ -277,5 +278,12 @@ public class FileParameterValue extends
          public OutputStream getOutputStream() throws IOException {
              return new FileOutputStream(file);
          }
 +
 +        public void setHeaders(FileItemHeaders headers) {
 +        }
++
++        public FileItemHeaders getHeaders() {
++            return null;
++        }
      }
  }

-- 
jenkins packaging



More information about the pkg-java-commits mailing list