[SCM] stapler-adjunct-timeline packaging branch, master, updated. debian/1.3-1-4-ge013d45

[James Page]

The following commit has been merged in the master branch:
commit e013d45bf4b34485c53b287a9c9ae4f93f8a2654
Author: James Page <james.page at canonical.com>
Date:   Fri Oct 28 09:17:05 2011 +0100

    Updates to comply with dfsg

diff --git a/debian/changelog b/debian/changelog
index 9c1be66..db1d686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-stapler-adjunct-timeline (1.3-1) unstable; urgency=low
+stapler-adjunct-timeline (1.3+dfsg-1) unstable; urgency=low
 
-  * Initial Debian release (Closes: #631960)
+  * Initial Debian release (Closes: #631960).
+  * Repack upstream tarball to remove embedded javascript.
   * Amended obsolete field names in debian/copyright.
 
  -- James Page <james.page at ubuntu.com>  Wed, 26 Oct 2011 16:44:22 +0100
diff --git a/debian/control b/debian/control
index 0ee6792..97c6914 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: James Page <james.page at ubuntu.com>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
+ libjs-simile-timeline,
  libmaven-javadoc-plugin-java,
  libservlet2.5-java,
  libstapler-java,
diff --git a/debian/rules b/debian/rules
index b76c54a..31d7588 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,17 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
+
+# Patch in timeline component from Debian js library
+before-mvn-build::
+	ln -sf /usr/share/javascript/timeline_ajax src/main/resources/org/kohsuke/stapler/simile
+	ln -sf /usr/share/javascript/timeline_js src/main/resources/org/kohsuke/stapler/simile
+
+clean::
+	rm -rf src/main/resources/org/kohsuke/stapler/simile/timeline_*
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	mv ../stapler-adjunct-timeline_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+		../stapler-adjunct-timeline_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz        
diff --git a/debian/watch b/debian/watch
index 1766642..161aa2c 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/stapler/stapler-adjunct-timeline/ stapler-adjunct-timeline-(.*).tar.gz  debian debian/orig-tar.sh

-- 
stapler-adjunct-timeline packaging