[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d

[James Page]

The following commit has been merged in the master branch:
commit 8ce69b58fcc4d1bb74901dc549643ff52a76834b
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 24 22:16:48 2013 +0000

    Re-instate control var processing for Debian

diff --git a/debian/changelog b/debian/changelog
index 3ff8637..36a3dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
 
-  * New upstream release (Closes: #700761):
+  * New upstream release (Closes: #700761, #679616):
     - d/control: Versioned BD jenkins-remoting >= 2.22.
     - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
     - d/control: Versioned BD stapler >= 1.198.
diff --git a/debian/control b/debian/control
index 8bcdfbf..27638bb 100644
--- a/debian/control
+++ b/debian/control
@@ -195,9 +195,7 @@ Depends:
  adduser,
  default-jre-headless | java6-runtime-headless,
  jenkins-common,
- net-tools,
- procps,
- psmisc,
+ ${jenkins-daemon-deps},
  ${misc:Depends}
 Conflicts: jenkins-tomcat, tomcat6
 Description: Continuous Integration and Job Scheduling Server
@@ -226,6 +224,7 @@ Architecture: all
 Depends:
  adduser,
  default-jre-headless | java6-runtime-headless,
+ ${jenkins-daemon-deps},
  ${misc:Depends}
 Recommends: jenkins-cli, ssh-server | openssh-server
 Description: Jenkins slave node helper
diff --git a/debian/debian_control_vars b/debian/debian_control_vars
new file mode 100644
index 0000000..f718e44
--- /dev/null
+++ b/debian/debian_control_vars
@@ -0,0 +1 @@
+jenkins-daemon-deps= daemon, psmisc, net-tools, procps,  psmisc
diff --git a/debian/rules b/debian/rules
index e586ac9..6f97f63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,12 @@ DEB_MAVEN_BUILD_TARGET := install
 DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
 DEB_MAVEN_INSTALL_TO_USJ := false
 
+# Debian package version use daemon to control jenkins processes
+# Ubuntu does not need this - managed by upstart
+ifeq ($(shell dpkg-vendor --derives-from ubuntu || echo debian ),debian)
+DEB_DH_GENCONTROL_ARGS:= -- -Tdebian/debian_control_vars
+endif
+
 # Sort out MANIFEST.MF entries in jenkins cli .jar files
 # and create handy links for script wrapper
 binary-post-install/jenkins-cli::

-- 
jenkins packaging