[epubcheck] 01/01: Make package build reproducibly

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to branch master
in repository epubcheck.

commit 3255ba03328de883bb7470288f733d00f247b6b7
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Fri Sep 4 22:59:40 2015 +0300

    Make package build reproducibly
---
 debian/changelog |  7 +++++++
 debian/control   |  2 +-
 debian/rules     | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c2bcf8..59ffe94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+epubcheck (4.0.0-2) unstable; urgency=medium
+
+  * Override maven.build.timestamp with date from d/changelog
+  * d/control: add build dependency on cdbs package
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Fri, 04 Sep 2015 22:56:13 +0300
+
 epubcheck (4.0.0-1) unstable; urgency=medium
 
   * New upstream release 4.0.0
diff --git a/debian/control b/debian/control
index 609e383..293c48e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: text
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
 Build-Depends-Indep: libcommons-compress-java,
                      libguava-java,
                      libjing-java (>= 20131210+dfsg+1),
diff --git a/debian/rules b/debian/rules
index 192ead8..301b8fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,21 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --parallel --buildsystem=maven
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+JAVA_HOME := /usr/lib/jvm/default-java
 
-override_dh_link:
-	dh_link
+DEB_MAVEN_ARGS := -Dmaven.build.timestamp=$(SOURCE_DATE_EPOCH)
+
+binary-post-install/epubcheck::
 	mh_installjar -pepubcheck -l pom.xml target/epubcheck.jar
 	chmod +x debian/epubcheck/usr/share/java/epubcheck.jar
 
-VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
+VER_FULL = $(shell dpkg-parsechangelog -S Version | cut -f1 -d-)
 
 debian/epubcheck.1: debian/epubcheck.1.in
 	help2man --include=$< --output=$@ \
-		--no-info --help-option="-help" `basename $@ .1` --version-string=$(VER_FULL)
+		--no-info --help-option="-help" \
+			`basename $@ .1` --version-string=$(VER_FULL)
 
 get-orig-source:
-	uscan --download-current-version --force-download --rename --verbose
+	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/epubcheck.git