[rkward/releases/0.7.0] debian-official: Allow building with R 3.0.0 upwards, agsin.

Thomas Friedrichsmeier null at kde.org
Fri Apr 27 07:23:55 UTC 2018


Git commit 14b1902da0c85da29f260c23708e0af290ea4db5 by Thomas Friedrichsmeier.
Committed on 27/04/2018 at 07:23.
Pushed by tfry into branch 'releases/0.7.0'.

Allow building with R 3.0.0 upwards, agsin.

M  +2    -1    debian-official/changelog
M  +1    -1    debian-official/control
M  +7    -3    debian-official/rules

https://commits.kde.org/rkward/14b1902da0c85da29f260c23708e0af290ea4db5

diff --git a/debian-official/changelog b/debian-official/changelog
index 4a6a6aff..58c20ceb 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -3,7 +3,8 @@ rkward (0.7.0b-1) unstable; urgency=low
     Includes missing translation files in rkward-data
   * Replace kdoctools-dev dependency with libkf5doctools-dev
     closes: #895875
-  * Build against r-base-core version 3.5.0 (ABI incompatible with 3.4.x)
+  * Depend on r-api-3.5 when built against r-base-core >= 3.5.0
+  * Do not depend on r-api-3.4 when built against r-base-core < 3.4.0
 
  -- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>  Mon, 23 Apr 2018 20:00:00 +0100
 
diff --git a/debian-official/control b/debian-official/control
index 90f7ea40..60e0f262 100644
--- a/debian-official/control
+++ b/debian-official/control
@@ -9,7 +9,7 @@ Build-Depends: cmake,
                libkf5webkit-dev,
                libkf5texteditor-dev,
                libkf5doctools-dev,
-               r-base-dev (>= 3.5.0)
+               r-base-dev (>= 3.0.0)
 Standards-Version: 4.1.4
 Homepage: http://rkward.kde.org
 Vcs-Browser: https://cgit.kde.org/rkward.git/tree/debian-official
diff --git a/debian-official/rules b/debian-official/rules
index ee1ea99d..34288d87 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -48,9 +48,13 @@ override_dh_compress:
 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 (esp. foward incompatibility) again, in the future.
 	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "5" ] ; then \
 		echo "rvers=r-base-core (>= $(RVERS))" >> $(CURDIR)/debian/rkward.substvars ; \
 		echo "rapivers=r-api-3.5" >> $(CURDIR)/debian/rkward.substvars ; \
-	fi
+	else \
+		if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "4" ] ; then \
+		echo "rvers=r-base-core (>= $(RVERS)), r-base-core (<< 3.5.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rapivers=r-api-3.4" >> $(CURDIR)/debian/rkward.substvars ; \
+	else \
+		echo "rvers=r-base-core (>= $(RVERS)), r-base-core (<< 3.5.0)" >> $(CURDIR)/debian/rkward.substvars ; \
+	fi; fi; fi



More information about the rkward-tracker mailing list