[SCM] jenkins packaging branch, master, updated. debian/1.424.2+dfsg-2-3-gcb7b7ac

[James Page]

The following commit has been merged in the master branch:
commit 61c409c536d2aaf569bc32bde0d365953baa0b59
Author: James Page <james.page at ubuntu.com>
Date:   Fri Feb 10 15:34:08 2012 +0000

    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.

diff --git a/debian/changelog b/debian/changelog
index 0423389..f259a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jenkins (1.424.2+dfsg-3) unstable; urgency=low
+
+  * 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. 
+
+ -- James Page <james.page at ubuntu.com>  Fri, 10 Feb 2012 15:32:33 +0000
+
 jenkins (1.424.2+dfsg-2) unstable; urgency=low
 
   * Enable Jenkins plugin components to support building plugins and 
diff --git a/debian/control b/debian/control
index 7f60a34..8f7cb09 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,9 @@ Build-Depends-Indep:
  groovy,
  jenkins-crypto-util,
  jenkins-executable-war (>= 1.25),
+ jenkins-instance-identity,
  jenkins-memory-monitor,
+ jenkins-ssh-cli-auth,
  jenkins-task-reactor,
  jenkins-test-annotations,
  junit (>= 3.8.2),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 9fd8fe9..ef68a02 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -63,15 +63,9 @@ org.jenkins-ci jinterop-wmi * * * *
 org.jenkins-ci windows-remote-command * * * *
 # OK: Ignore asm2 components not present in asm3
 #asm asm-attrs * * * *
-# OK: Ignore identity stuff in Jenkins for now
-org.jenkins-ci.modules instance-identity * * * *
 # New deps to ignore for 1.424.1
 org.codehaus.mojo build-helper-maven-plugin * * * *
 # Ignore JRebel - does not appear to by used
 org.kohsuke.stapler stapler-jrebel * * * *
 # Ignore core annotation processors - this is a dummy pakcage
 org.jenkins-ci core-annotation-processors * * * *
-# FIXME: Temp ignore - these need packaging but maven-hpi-plugin 
-# needs fixing up first.
-org.jenkins-ci.modules instance-identity * * * *
-org.jenkins-ci.modules ssh-cli-auth * * * *

-- 
jenkins packaging