[rkward/releases/0.7.0] debian-official: Prepare for rebuild against R 3.5.x

Thomas Friedrichsmeier null at kde.org
Mon Apr 23 18:15:40 UTC 2018


Git commit b27dbca52ee4d9421a3a73458f03156dfd7204bc by Thomas Friedrichsmeier.
Committed on 23/04/2018 at 18:15.
Pushed by tfry into branch 'releases/0.7.0'.

Prepare for rebuild against R 3.5.x

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

https://commits.kde.org/rkward/b27dbca52ee4d9421a3a73458f03156dfd7204bc

diff --git a/debian-official/changelog b/debian-official/changelog
index bd38e173..4a6a6aff 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -3,8 +3,9 @@ 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)
 
- -- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>  Mon, 16 Apr 2018 20:00:00 +0100
+ -- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>  Mon, 23 Apr 2018 20:00:00 +0100
 
 rkward (0.7.0-1) unstable; urgency=low
   * New upstream release
diff --git a/debian-official/control b/debian-official/control
index 60e0f262..90f7ea40 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.0.0)
+               r-base-dev (>= 3.5.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 d9f11b7b..ee1ea99d 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -50,7 +50,7 @@ override_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 "0" ] ; then \
+	@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "5" ] ; then \
 		echo "rvers=r-base-core (>= $(RVERS))" >> $(CURDIR)/debian/rkward.substvars ; \
-		echo "rapivers=r-api-3.4" >> $(CURDIR)/debian/rkward.substvars ; \
+		echo "rapivers=r-api-3.5" >> $(CURDIR)/debian/rkward.substvars ; \
 	fi



More information about the rkward-tracker mailing list