[SCM] jenkins packaging branch, master, updated. upstream/1.409.3-3-gcc83a9a

[James Page]

The following commit has been merged in the master branch:
commit 154abda5063b2a47dc73019c68ef8e8d7a5cb3a4
Author: James Page <james.page at canonical.com>
Date:   Wed Dec 7 09:17:04 2011 +0000

    Disabled build of libjenkins-plugin-parent-java as not currently installable due to broken upstream maven-hpi-plugin.

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/debian/changelog b/debian/changelog
index e8ce686..56915cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 jenkins (1.409.3-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #561963)
+  * Disabled build of libjenkins-plugin-parent-java as not currently
+    installable due to broken upstream maven-hpi-plugin.
 
- -- James Page <james.page at ubuntu.com>  Mon, 05 Dec 2011 21:12:59 +0000
+ -- James Page <james.page at ubuntu.com>  Wed, 07 Dec 2011 09:16:03 +0000
 
 jenkins (1.409.3-0ubuntu1) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index 6e738f6..25b9d62 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,6 @@ Build-Depends-Indep:
  libmaven-dependency-plugin-java,
  libmaven-embedder-java,
  libmaven-enforcer-plugin-java,
- libmaven-hpi-plugin-java,
  libmaven-install-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-stapler-plugin-java,
@@ -119,29 +118,29 @@ Description: Jenkins CI core Java libraries
  This package contains the core libraries that are used by Jenkins.
  These are useful when building other components such as plugins.
 
-Package: libjenkins-plugin-parent-java
-Architecture: all
-Depends: libmaven-hpi-plugin-java, libmaven-stapler-plugin-java, ${misc:Depends}
-Description: Jenkins Plugin Parent Maven POM
- Jenkins monitors executions of repeated jobs, such as building a software
- project or jobs run by cron. Among those things, current Jenkins focuses
- on the following two jobs:
- .
-  * Building/testing software projects continuously, just like CruiseControl
-    or DamageControl. In a nutshell, Jenkins provides an easy-to-use
-    so-called continuous integration system, making it easier for developers
-    to integrate changes to the project, and making it easier for users to
-    obtain a fresh build. The automated, continuous build increases
-    productivity.
-  * Monitoring executions of externally-run jobs, such as cron jobs and
-    procmail jobs, even those that are run on a remote machine. For example,
-    with cron, all you receive is regular e-mails that capture the output,
-    and it is up to you to look at them diligently and notice when it broke.
-    Jenkins keeps those outputs and makes it easy for you to notice when
-    something is wrong.
- .
- This package contains the parent POM file that all Jenkins plugins should be
- built against.
+#Package: libjenkins-plugin-parent-java
+#Architecture: all
+#Depends: libmaven-hpi-plugin-java, libmaven-stapler-plugin-java, ${misc:Depends}
+#Description: Jenkins Plugin Parent Maven POM
+# Jenkins monitors executions of repeated jobs, such as building a software
+# project or jobs run by cron. Among those things, current Jenkins focuses
+# on the following two jobs:
+# .
+#  * Building/testing software projects continuously, just like CruiseControl
+#    or DamageControl. In a nutshell, Jenkins provides an easy-to-use
+#    so-called continuous integration system, making it easier for developers
+#    to integrate changes to the project, and making it easier for users to
+#    obtain a fresh build. The automated, continuous build increases
+#    productivity.
+#  * Monitoring executions of externally-run jobs, such as cron jobs and
+#    procmail jobs, even those that are run on a remote machine. For example,
+#    with cron, all you receive is regular e-mails that capture the output,
+#    and it is up to you to look at them diligently and notice when it broke.
+#    Jenkins keeps those outputs and makes it easy for you to notice when
+#    something is wrong.
+# .
+# This package contains the parent POM file that all Jenkins plugins should be
+# built against.
 
 Package: jenkins-common
 Architecture: all
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 50b19ed..6f72d3f 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -25,6 +25,6 @@
 #
 pom.xml --has-package-version --no-parent
 remoting/pom.xml --has-package-version --ignore-pom
-core/pom.xml --has-package-version --ignore-pom --artifact=core/target/jenkins-1.409.1.war
+core/pom.xml --has-package-version --ignore-pom
 war/pom.xml --has-package-version --ignore-pom
 cli/pom.xml --has-package-version --ignore-pom

-- 
jenkins packaging