[rkward/releases/0.6.5] /: Bookkeeping and more conservative runtime dependencies

[Thomas Friedrichsmeier]

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

Bookkeeping and more conservative runtime dependencies

M  +4    -2    debian-official/changelog
M  +2    -2    debian-official/rules
M  +2    -0    debian/changelog
M  +1    -1    debian/rules

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

diff --git a/debian-official/changelog b/debian-official/changelog
index 0786399..1a3eb5e 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -2,8 +2,10 @@ rkward (0.6.5-1) UNRELEASED; urgency=low
   * new upstream release
     (unchanged with respect to ~rc1)
   * fix debian/watch file
-  * switch to dh-based rules file
-    !!!TODO!!!: Does this fix the rkward-data build for binary-arch problem?
+  * always use build-time version of r-base-core as runtime dependency, even
+    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)
     closes: #783290
 
diff --git a/debian-official/rules b/debian-official/rules
index 07d47f4..f3bc7d7 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -62,7 +62,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps
 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
 	# NOTE: This "if" is currently always true (see build-deps), but left here, for convenience, in case we get into trouble
-	# with binary incompatibility (backward / foward) again, in the future.
+	# with binary incompatibility (esp. foward incompatibility) again, in the future.
 	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
-		echo "rvers=r-base-core (>= 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (>= $(RMAJOR).$(RMINOR).0)" >> $(CURDIR)/debian/rkward.substvars ; \
 	fi
diff --git a/debian/changelog b/debian/changelog
index 1bbf443..b91bf51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 rkward (0.6.5-1) UNRELEASED; urgency=low
   * new upstream release
   * fix debian/watch file
+  * always use build-time version of r-base-core as runtime dependency, even
+    if most builds would actually be backwards compatible
   * split architecture independent files into new rkward-data package
   * bump standards version to 3.9.7 (no changes needed)
   * strip testing locale "x-test" from package
diff --git a/debian/rules b/debian/rules
index 4f904a7..6bbe222 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,7 +133,7 @@ binary-arch: build install
 	dh_shlibdeps
 	# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
 	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
-		echo "rvers=r-base-core (>= 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rvers=r-base-core (>= $(RVERS))" >> $(CURDIR)/debian/rkward.substvars ; \
 	else \
 		if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
 		echo "rvers=r-base-core (>= 2.9.0), r-base-core (<< 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \