[SCM] jenkins packaging branch, master, updated. debian/1.466.2+dfsg-1-13-gf2fe1f8

[James Page]

The following commit has been merged in the master branch:
commit 8cbfae1a6d6eb98565ae9bf833484125fe023914
Author: James Page <james.page at ubuntu.com>
Date:   Wed Jan 9 17:51:50 2013 +0000

    Updates for new upstream release

diff --git a/debian/changelog b/debian/changelog
index 7c5a717..c31edfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jenkins (1.480.1-1) UNRELEASED; urgency=low
+jenkins (1.480.2-1~exp1) UNRELEASED; urgency=low
 
-  * New upstream release. 
+  * New upstream release:
+    - d/control: Added new BD on libjbcrypt-java.
+    - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-40.
 
  -- James Page <james.page at ubuntu.com>  Wed, 05 Dec 2012 21:56:17 +0000
 
diff --git a/debian/control b/debian/control
index 9a58804..a373809 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Build-Depends-Indep:
  libcommons-lang-java,
  libcommons-logging-java,
  libjaxen-java,
+ libjbcrypt-java (>= 0.3-4~),
  libjellydoc-java,
  libjenkins-plugin-parent-java,
  libjenkins-commons-jelly-java,
@@ -54,7 +55,7 @@ Build-Depends-Indep:
  libjenkins-json-java (>= 2.1-rev7),
  libjenkins-remoting-java (>= 2.16),
  libjenkins-trilead-ssh2-java,
- libjenkins-winstone-java (>= 0.9.10-jenkins-35),
+ libjenkins-winstone-java (>= 0.9.10-jenkins-40),
  libjenkins-xstream-java,
  libjetty-java,
  libjffi-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index ab20ada..23d9da5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,7 +21,7 @@ commons-collections commons-collections jar s/3\..*/3.x/ * *
 commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
 junit s/junit-dep/junit/ * s/.*/4.x/ * *
 # Map onto exact version during build process
-org.jenkins-ci.main * * s/1\..*/1.466.2/ * *
+org.jenkins-ci.main * * s/1\..*/1.480.2/ * *
 # Handle plugin package
 org.kohsuke access-modifier-annotation jar s/.*/1.0/ * *
 org.kohsuke access-modifier-checker *  s/.*/1.0/ * *
diff --git a/debian/patches/build/remove-findbugs.patch b/debian/patches/build/remove-findbugs.patch
index e6c8814..e03e83c 100644
--- a/debian/patches/build/remove-findbugs.patch
+++ b/debian/patches/build/remove-findbugs.patch
@@ -38,7 +38,7 @@ Forwarded: not-needed
          Logger.getLogger("hudson").addHandler(handler);
 --- a/core/src/main/java/jenkins/model/Jenkins.java
 +++ b/core/src/main/java/jenkins/model/Jenkins.java
-@@ -727,7 +727,6 @@ public class Jenkins extends AbstractCIB
+@@ -730,7 +730,6 @@ public class Jenkins extends AbstractCIB
       * @param pluginManager
       *      If non-null, use existing plugin manager.  create a new one.
       */
@@ -46,7 +46,7 @@ Forwarded: not-needed
      protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
          long start = System.currentTimeMillis();
          
-@@ -2989,7 +2988,6 @@ public class Jenkins extends AbstractCIB
+@@ -3018,7 +3017,6 @@ public class Jenkins extends AbstractCIB
      /**
       * For debugging. Expose URL to perform GC.
       */
@@ -100,3 +100,13 @@ Forwarded: not-needed
              public Object doCall(Object[] args) throws ChannelClosedException {
                  if (args.length == 1 && args[0] instanceof ChannelClosedException) {
                      throw (ChannelClosedException)args[0];
+--- a/core/src/main/java/jenkins/util/ProgressiveRendering.java
++++ b/core/src/main/java/jenkins/util/ProgressiveRendering.java
+@@ -24,7 +24,6 @@
+ 
+ package jenkins.util;
+ 
+-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+ import hudson.model.Computer;
+ import java.util.concurrent.ExecutorService;
+ import java.util.logging.Level;
diff --git a/debian/patches/build/use-stock-jmdns.patch b/debian/patches/build/use-stock-jmdns.patch
index f47b595..0d946d9 100644
--- a/debian/patches/build/use-stock-jmdns.patch
+++ b/debian/patches/build/use-stock-jmdns.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/core/src/main/java/hudson/DNSMultiCast.java
 +++ b/core/src/main/java/hudson/DNSMultiCast.java
-@@ -67,12 +67,12 @@ public class DNSMultiCast implements Clo
+@@ -66,12 +66,12 @@ public class DNSMultiCast implements Clo
  
      public void close() {
          if (jmdns!=null) {
diff --git a/debian/patches/native-integration/purge-windows-support.patch b/debian/patches/native-integration/purge-windows-support.patch
index fa32d0a..37755c2 100644
--- a/debian/patches/native-integration/purge-windows-support.patch
+++ b/debian/patches/native-integration/purge-windows-support.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
  import hudson.Util;
  import hudson.AbortException;
  import hudson.remoting.Launcher;
-@@ -365,7 +364,6 @@ public class SlaveComputer extends Compu
+@@ -370,7 +369,6 @@ public class SlaveComputer extends Compu
          channel.pinClassLoader(getClass().getClassLoader());
  
          channel.call(new SlaveInitializer());
diff --git a/debian/patches/series b/debian/patches/series
index 5d3c296..f8979ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ dependency-upgrades/jnr-posix-upgrade.patch
 build/use-stock-jmdns.patch
 ubuntu/ubuntu-font.patch
 build/use-stock-asm3.patch
+build/use-debian-jbcrypt.patch
diff --git a/debian/rules b/debian/rules
index a05436a..8871d74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 # Parse upstream version without +dfsg for source download+
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p')
 DEB_MAVEN_BUILD_TARGET := install
 DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
 DEB_MAVEN_INSTALL_TO_USJ := false

-- 
jenkins packaging