[rkward/releases/0.6.5] debian-official: Backport builttime fix from master as a debian patch.

[Thomas Friedrichsmeier]

Git commit be6245482cd7b82cf764d60a349032e0cfe9aca7 by Thomas Friedrichsmeier.
Committed on 04/04/2016 at 08:41.
Pushed by tfry into branch 'releases/0.6.5'.

Backport builttime fix from master as a debian patch.

M  +1    -1    debian-official/changelog
A  +8    -0    debian-official/patches/pass_builttime
M  +1    -0    debian-official/patches/series
M  +1    -1    debian-official/rules

http://commits.kde.org/rkward/be6245482cd7b82cf764d60a349032e0cfe9aca7

diff --git a/debian-official/changelog b/debian-official/changelog
index 1a3eb5e..c4b167d 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -6,7 +6,7 @@ rkward (0.6.5-1) UNRELEASED; urgency=low
     if most builds would actually be backwards compatible
   * switch to dh-based rules file. This also fixes missing separation between
     arch-dependent and arch-independent build targets
-  * !!!TODO!!!: Make build really reproducible (fix for earlier attempt upstream)
+  * Make build really reproducible (fix for earlier attempt upstream)
     closes: #783290
 
  -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Tue, 29 Mar 2016 11:00:00 +0100
diff --git a/debian-official/patches/pass_builttime b/debian-official/patches/pass_builttime
new file mode 100644
index 0000000..a3c58ff
--- /dev/null
+++ b/debian-official/patches/pass_builttime
@@ -0,0 +1,8 @@
+--- a/rkward/rbackend/rpackages/rpackage_install.cmake.in
++++ b/rkward/rbackend/rpackages/rpackage_install.cmake.in
+@@ -1,4 +1,5 @@
+ SET(DESTDIR $ENV{DESTDIR})
++SET(BUILD_TIMESTAMP "@BUILD_TIMESTAMP@")
+ 
+ MESSAGE(STATUS "Installing R support packages")
+ 
diff --git a/debian-official/patches/series b/debian-official/patches/series
index c62d431..5355195 100644
--- a/debian-official/patches/series
+++ b/debian-official/patches/series
@@ -1 +1,2 @@
+pass_builttime
 revert_to_khtml.patch
diff --git a/debian-official/rules b/debian-official/rules
index f3bc7d7..fbfee84 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -64,5 +64,5 @@ override_dh_shlibdeps:
 	# NOTE: This "if" is currently always true (see build-deps), but left here, for convenience, in case we get into trouble
 	# with binary incompatibility (esp. foward incompatibility) again, in the future.
 	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
-		echo "rvers=r-base-core (>= $(RMAJOR).$(RMINOR).0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (>= $(RVERS))" >> $(CURDIR)/debian/rkward.substvars ; \
 	fi