This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/1.565.3-2 in repository jenkins.
commit ed5ac9432c1189bad0b2e3c2697ee3bf8c940f99 Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 22 00:09:48 2014 +0200 Added a Built-Using field for jenkins-common --- debian/changelog | 1 + debian/control | 14 ++++++++++++++ debian/rules | 32 +++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0799cd7..7c463af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ jenkins (1.565.3-2) UNRELEASED; urgency=medium * Depend on libguice-java >= 4.0~beta5 to fix a NoSuchMethodError at runtime with the Maven plugin * Standards-Version updated to 3.9.6 (no changes) + * Added a Built-Using field for jenkins-common -- Emmanuel Bourg <[email protected]> Fri, 10 Oct 2014 18:06:20 +0200 diff --git a/debian/control b/debian/control index 502c424..fb9bb58 100644 --- a/debian/control +++ b/debian/control @@ -174,6 +174,20 @@ Depends: libjnr-posix-java, ${misc:Depends} Recommends: jenkins-cli +Built-Using: + acegi-security (= ${acegi:Version}), + bouncycastle (= ${bouncycastle:Version}), + commons-httpclient (= ${httpclient:Version}), + guice (= ${guice:Version}), + jenkins-ant-plugin (= ${ant-plugin:Version}), + jenkins-antisamy-markup-formatter-plugin (= ${antisamy-plugin:Version}), + jenkins-mailer-plugin (= ${mailer-plugin:Version}), + jenkins-matrix-auth-plugin (= ${matrix-auth-plugin:Version}), + jenkins-matrix-project-plugin (= ${matrix-project-plugin:Version}), + jenkins-winstone (= ${winstone:Version}), + libcommons-fileupload-java (= ${fileupload:Version}), + libspring-java (= ${spring:Version}), + stapler (= ${stapler:Version}) Description: Jenkins common Java components and web application Jenkins monitors executions of repeated jobs, such as building a software project or jobs run by cron. Among those things, current Jenkins focuses diff --git a/debian/rules b/debian/rules index 0c10cad..d805947 100755 --- a/debian/rules +++ b/debian/rules @@ -12,10 +12,40 @@ DEB_MAVEN_BUILD_TARGET := install DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)" DEB_MAVEN_INSTALL_TO_USJ := false +# Fetch the versions of the dependencies bundled in jenkins.war +ACEGI_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libacegi-security-java) +BOUNCYCASTLE_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libbcpkix-java) +FILEUPLOAD_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcommons-fileupload-java) +HTTPCLIENT_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcommons-httpclient-java) +SPRING_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libspring-core-java) +STAPLER_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libstapler-java) +GUICE_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libguice-java) +WINSTONE_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libjenkins-winstone-java) +ANT_PLUGIN_VERSION := $(shell dpkg-query -f '$${source:Version}' --show jenkins-ant-plugin) +ANTISAMY_PLUGIN_VERSION := $(shell dpkg-query -f '$${source:Version}' --show jenkins-antisamy-markup-formatter-plugin) +MAILER_PLUGIN_VERSION := $(shell dpkg-query -f '$${source:Version}' --show jenkins-mailer-plugin) +MATRIX_AUTH_PLUGIN_VERSION := $(shell dpkg-query -f '$${source:Version}' --show jenkins-matrix-auth-plugin) +MATRIX_PROJECT_PLUGIN_VERSION := $(shell dpkg-query -f '$${source:Version}' --show jenkins-matrix-project-plugin) + +DEB_DH_GENCONTROL_ARGS := -- -Vacegi:Version=${ACEGI_VERSION} \ + -Vbouncycastle:Version=${BOUNCYCASTLE_VERSION} \ + -Vfileupload:Version=${FILEUPLOAD_VERSION} \ + -Vguice:Version=${GUICE_VERSION} \ + -Vhttpclient:Version=${HTTPCLIENT_VERSION} \ + -Vspring:Version=${SPRING_VERSION} \ + -Vstapler:Version=${STAPLER_VERSION} \ + -Vwinstone:Version=${WINSTONE_VERSION} +# Jenkins plugins +DEB_DH_GENCONTROL_ARGS += -Vant-plugin:Version=${ANT_PLUGIN_VERSION} \ + -Vantisamy-plugin:Version=${ANTISAMY_PLUGIN_VERSION} \ + -Vmailer-plugin:Version=${MAILER_PLUGIN_VERSION} \ + -Vmatrix-auth-plugin:Version=${MATRIX_AUTH_PLUGIN_VERSION} \ + -Vmatrix-project-plugin:Version=${MATRIX_PROJECT_PLUGIN_VERSION} + # 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 +DEB_DH_GENCONTROL_ARGS += -Tdebian/debian_control_vars endif # Generate POM file for plugins -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
