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

[James Page]

The following commit has been merged in the master branch:
commit 58853ece63c3dd78e9aeb696f07d90fc4524acf0
Author: James Page <james.page at ubuntu.com>
Date:   Tue Sep 25 11:58:41 2012 +0100

    d/rules: Tweaked handling of groovy -> java source file copy to accomodate the file created by the above patch.

diff --git a/debian/changelog b/debian/changelog
index 7a1cd3f..5f0ed4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ jenkins (1.447.2+dfsg-2) unstable; urgency=low
     - d/p/security/CVE-2012-4438_CVE-2012-4439.patch: Cherry picked
       fixes from 1.466.2 release to resolve remote code execution
       and XSS security vulnerabilities.
+    - d/rules: Tweaked handling of groovy -> java source file copy to
+      accomodate the file created by the above patch.
     - Fixes: CVE-2012-4438, CVE-2012-4439
 
  -- James Page <james.page at ubuntu.com>  Tue, 25 Sep 2012 11:01:53 +0100
diff --git a/debian/rules b/debian/rules
index e5f18e8..278b6a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,7 @@ clean::
 	[ ! -f dummy.keystore ] || rm dummy.keystore
 	rm -rf debian/*.upstart
 	rm -rf debian/plugin-debian.pom
-	rm -rf core/src/main/java/jenkins/util
+	rm -rf core/src/main/java/jenkins/util/ServerTcpPort.java
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
@@ -73,7 +73,6 @@ before-mvn-build:: dummy.keystore
 	done
 	# Hack in java files from groovy source folder - no idea why they are there
 	# might be maven3 related.
-	mkdir -p core/src/main/java/jenkins/util
 	cp core/src/main/groovy/jenkins/util/ServerTcpPort.java core/src/main/java/jenkins/util
 
 dummy.keystore:

-- 
jenkins packaging