[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d
James Page
james.page at ubuntu.com
Sun Feb 24 22:25:07 UTC 2013
The following commit has been merged in the master branch:
commit 752173cb12e9a2b868d71cec4369c734ca9637e6
Author: James Page <james.page at ubuntu.com>
Date: Sun Feb 24 21:45:14 2013 +0000
* d/rules,control, *.upstart.in: Rejig upstart/init configurations now
that debhelper does the right thing across Debian/Ubuntu.
* d/rules,plugin_parent.pom.in: Drop as good plugin parent pom now
provided upstream.
diff --git a/debian/changelog b/debian/changelog
index 68d3997..3ff8637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
(Closes: #698834).
* d/control: Add net-tools and procps dependencies to jenkins
(Closes: #698835).
+ * d/rules,control, *.upstart.in: Rejig upstart/init configurations now
+ that debhelper does the right thing across Debian/Ubuntu.
+ * d/rules,plugin_parent.pom.in: Drop as good plugin parent pom now
+ provided upstream.
-- James Page <james.page at ubuntu.com> Sun, 17 Feb 2013 17:11:13 +0000
diff --git a/debian/control b/debian/control
index 216e86d..8bcdfbf 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,7 @@ Description: Jenkins Plugin Parent Maven POM
Package: jenkins-common
Architecture: all
Depends:
- libjenkins-remoting-java,
+ libjenkins-remoting-java (>= 2.22),
libjffi-java,
libjna-java,
libjnr-posix-java,
@@ -197,7 +197,7 @@ Depends:
jenkins-common,
net-tools,
procps,
- ${jenkins-daemon-deps},
+ psmisc,
${misc:Depends}
Conflicts: jenkins-tomcat, tomcat6
Description: Continuous Integration and Job Scheduling Server
@@ -226,7 +226,6 @@ 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
@@ -261,7 +260,7 @@ Depends:
default-jre-headless | java6-runtime-headless,
libcommons-io-java,
libcommons-lang-java,
- libjenkins-remoting-java,
+ libjenkins-remoting-java (>= 2.22),
libjenkins-xstream-java,
libjffi-java,
libjnr-posix-java,
diff --git a/debian/debian_control_vars b/debian/debian_control_vars
deleted file mode 100644
index 0c8ffb4..0000000
--- a/debian/debian_control_vars
+++ /dev/null
@@ -1 +0,0 @@
-jenkins-daemon-deps= daemon, psmisc
diff --git a/debian/jenkins-slave.upstart.in b/debian/jenkins-slave.upstart
similarity index 100%
rename from debian/jenkins-slave.upstart.in
rename to debian/jenkins-slave.upstart
diff --git a/debian/jenkins.upstart.in b/debian/jenkins.upstart
similarity index 100%
rename from debian/jenkins.upstart.in
rename to debian/jenkins.upstart
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index d3b9f34..45b4ce5 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -27,4 +27,4 @@ pom.xml --has-package-version --no-parent
core/pom.xml --has-package-version --ignore-pom
war/pom.xml --has-package-version --ignore-pom
cli/pom.xml --has-package-version --ignore-pom
-plugins/pom.xml --has-package-version --ignore-pom --no-parent
+plugins/pom.xml --has-package-version --ignore-pom --no-parent --package=libjenkins-plugin-parent-java
diff --git a/debian/plugin-debian.pom.in b/debian/plugin-debian.pom.in
deleted file mode 100644
index 49f6c3c..0000000
--- a/debian/plugin-debian.pom.in
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <!--
- This POM file is based on the Plugin POM file provided by
- jenkins core; however to make it work in any maintainable
- fashion in debian where we don't have a full maven repo
- with version metadata versions of plugins used in the build
- must be specified otherwise maven will not be able to resolve
- them.
- -->
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>plugin</artifactId>
- <name>Jenkins plugin POM</name>
- <version>debian</version>
- <packaging>pom</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.jenkins-ci.main</groupId>
- <artifactId>jenkins-core</artifactId>
- <version>__VERSION__</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.x</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <defaultGoal>package</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.kohsuke</groupId>
- <artifactId>access-modifier-checker</artifactId>
- <version>1.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.jenkins-ci.tools</groupId>
- <artifactId>maven-hpi-plugin</artifactId>
- <version>1.79</version>
- <extensions>true</extensions>
- <configuration>
- <showDeprecation>true</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.kohsuke.stapler</groupId>
- <artifactId>maven-stapler-plugin</artifactId>
- <version>1.16</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.jvnet.localizer</groupId>
- <artifactId>maven-localizer-plugin</artifactId>
- <version>1.13</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <fileMask>Messages.properties</fileMask>
- <outputDirectory>target/generated-sources/localizer</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>hudson.udp</name>
- <value>33849</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/debian/rules b/debian/rules
index a05436a..e586ac9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,23 +10,6 @@ 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
-
-# Generate POM file for plugins
-debian/plugin-debian.pom: debian/plugin-debian.pom.in
- sed -e "s|__VERSION__|$(DEB_UPSTREAM_VERSION)|g" $< > debian/plugin-debian.pom
-
-# Install the POM for plugin-parent manually as not part
-# of main build - manually installed as not managed by
-# m-d-h as breaks build elements for re-use.
-binary-post-install/libjenkins-plugin-parent-java:: debian/plugin-debian.pom
- dh_install -plibjenkins-plugin-parent-java debian/plugin-debian.pom \
- usr/share/maven-repo/org/jenkins-ci/plugins/plugin/debian
-
# Sort out MANIFEST.MF entries in jenkins cli .jar files
# and create handy links for script wrapper
binary-post-install/jenkins-cli::
@@ -40,23 +23,9 @@ binary-post-install/jenkins-external-job-monitor::
dh_link -pjenkins-external-job-monitor usr/share/jenkins/external-job-monitor/java/jenkins-core-$(DEB_UPSTREAM_VERSION).jar \
usr/share/jenkins/external-job-monitor/java/jenkins-core.jar
-# Switch in upstart configuration if building on Ubuntu
-# and generate control with/without daemon.
-build/jenkins::
- if dpkg-vendor --derives-from ubuntu ; then \
- cp debian/jenkins.upstart.in debian/jenkins.upstart ; \
- fi
-
-build/jenkins-slave::
- if dpkg-vendor --derives-from ubuntu ; then \
- cp debian/jenkins-slave.upstart.in debian/jenkins-slave.upstart ; \
- fi
-
# Tidy up any upstart configuration files lying around
clean::
[ ! -f dummy.keystore ] || rm dummy.keystore
- rm -rf debian/*.upstart
- rm -rf debian/plugin-debian.pom
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
--
jenkins packaging
More information about the pkg-java-commits
mailing list