[SCM] jenkins packaging branch, master, updated. debian/1.480.3+dfsg-1-4-g044500d

[James Page]

The following commit has been merged in the master branch:
commit 2c715764cb659c91fe0e49a4e73ce697da18c779
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jul 25 11:04:36 2013 +0100

    d/rules: Use mh_installpoms to install all pom files as this ensures that ignore rules are actually used.

diff --git a/debian/changelog b/debian/changelog
index 5a65d98..b8f48bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ jenkins (1.480.3+dfsg-1) unstable; urgency=low
     - d/p/build/io-compat.pach: Compatibility patch for commons-io >= 2.4.
     - d/control: Add versioned dependencies for the above patches.
   * d/*.init: Drop use of /lib/init/vars.sh.
+  * d/rules: Use mh_installpoms to install all pom files as this ensures
+    that ignore rules are actually used.
 
  -- James Page <james.page at ubuntu.com>  Thu, 04 Jul 2013 10:17:28 +0100
 
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 889880c..341d66f 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -24,6 +24,6 @@
 #     temporarily for certain artifacts such as Javadoc jars.
 #
 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
+core/pom.xml --has-package-version
+war/pom.xml --has-package-version
+cli/pom.xml --has-package-version
diff --git a/debian/rules b/debian/rules
index 7d5b6c7..b011cbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
@@ -40,6 +42,10 @@ 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
 
+# Install POM files directly
+binary-post-install/libjenkins-java::
+	mh_installpoms -plibjenkins-java
+
 # Tidy up any upstart configuration files lying around
 clean::
 	[ ! -f dummy.keystore ] || rm dummy.keystore

-- 
jenkins packaging