[SCM] jenkins packaging branch, master, updated. upstream/1.409.3-10-gbea8096

[James Page]

The following commit has been merged in the master branch:
commit 4d936398ad9f179129f3984a5512a77f4d7ae29b
Author: James Page <james.page at canonical.com>
Date:   Thu Jan 5 11:51:27 2012 +0000

    Updates for DFSG compliance

diff --git a/debian/changelog b/debian/changelog
index ad58d8b..ce4adab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-jenkins (1.409.3-1) unstable; urgency=low
+jenkins (1.409.3+dfsg-1) unstable; urgency=low
 
-  * Initial Debian release (Closes: #561963)
+  * Initial Debian release (Closes: #561963):
+    - Repack for DFSG compliance.
   * Disabled build of libjenkins-plugin-parent-java as not currently
     installable due to broken upstream maven-hpi-plugin.
   * Added Debian init scripts and default configuration for jenkins 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index d548cdb..ca4d134 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -10,6 +10,11 @@ tar -xzf $TAR -C $DIR --strip-components=1
 
 # Repack excluding stuff we don't need
 GZIP=--best tar -czf $TAR --exclude '*.jar' --exclude '*.class' \
-     --exclude 'CVS' --exclude '.svn' --exclude 'debian' $DIR
+     --exclude 'CVS' --exclude '.svn' --exclude "jenkins-$VERSION/debian" \
+     --exclude "jenkins-$VERSION/test" --exclude "jenkins-$VERSION/osx" \
+     --exclude "jenkins-$VERSION/ebuild" --exclude "jenkins-$VERSION/opensuse" \
+     --exclude "jenkins-$VERSION/rpm" --exclude 'hudson-logo.vsd' \
+     --exclude 'TangoProject-License.url' --exclude 'dummy.keystore' $DIR
+
 rm -rf $DIR
 
diff --git a/debian/rules b/debian/rules
index 0d91cd7..41bfda6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
+# Parse upstream version without +dfsg for source download+
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 DEB_MAVEN_BUILD_TARGET := install 
 DEB_MAVEN_ARGS := -e -Dbuild.version="$(DEB_UPSTREAM_VERSION)"
 DEB_MAVEN_INSTALL_TO_USJ := false
@@ -52,3 +54,5 @@ clean::
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	mv ../jenkins_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+        ../jenkins_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz
diff --git a/debian/watch b/debian/watch
index 6a365c5..c7e2fb2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg// \
+opts=dversionmangle=s/\+dfsg// \
 http://githubredir.debian.net/github/jenkinsci/jenkins/ jenkins-(\d+).(\d+).(\d+).tar.gz debian debian/orig-tar.sh

-- 
jenkins packaging