[rkward] debian: Sync with debian official packaging
Thomas Friedrichsmeier
null at kde.org
Wed Jun 13 08:31:48 UTC 2018
Git commit d935c967cbcbe1c5568f7fc92768ef42e5baf951 by Thomas Friedrichsmeier.
Committed on 13/06/2018 at 08:31.
Pushed by tfry into branch 'master'.
Sync with debian official packaging
M +4 -0 debian/changelog
M +10 -13 debian/rules
https://commits.kde.org/rkward/d935c967cbcbe1c5568f7fc92768ef42e5baf951
diff --git a/debian/changelog b/debian/changelog
index bea776dd..9b0ba30e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ rkward (0.7.0b-1) unstable; urgency=low
Includes missing translation files in rkward-data
* Replace kdoctools-dev dependency with libkf5doctools-dev
closes: #895875
+ * 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
+ * Remove explicit specification of C compiler
+ closes: #900591
-- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net> Mon, 16 Apr 2018 20:00:00 +0100
diff --git a/debian/rules b/debian/rules
index 020d05d2..49547962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
#we need to know the R version
RVERS = $(shell dpkg-query -W --showformat='$${Version}' r-base-core)
RMAJOR = $(shell echo $(RVERS) | awk -F. '{print $$1}')
RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
-# set built-time of GNUR packages to time of created binary package based on stamp in changelog
-builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
-
# Workaround for cmake not handling CPPFLAGS (https://wiki.debian.org/HardeningWalkthrough):
# As we cannot easily use dh for configuring, we have to merge flags, manually.
CFLAGS += $(CPPFLAGS)
@@ -22,16 +20,12 @@ BUILDDIR = $(CURDIR)/debian/build
override_dh_auto_configure:
mkdir -p $(BUILDDIR)
- # Some installations of R need a specific version of the compiler(s)
- # R CMD config provides info on which compiler to use
- CC="`/usr/bin/R CMD config CC`" \
- CXX="`/usr/bin/R CMD config CXX`" \
- F77="`/usr/bin/R CMD config F77`" \
+
dh_auto_configure '--buildsystem=kf5' --parallel -- \
-DR_EXECUTABLE=/usr/bin/R/ \
-DR_LIBDIR=/usr/lib/R/site-library/ \
-DCMAKE_SKIP_RPATH=YES \
- -DBUILD_TIMESTAMP="$(builttime)"
+ -DBUILD_TIMESTAMP="$(shell date --utc --date='@$(SOURCE_DATE_EPOCH)')"
override_dh_auto_install:
dh_auto_install
@@ -50,12 +44,15 @@ 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 ; \
+ 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 \
- if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
+ if [ "$(RMAJOR)" -eq "3" ] ; then \
echo "rvers=r-base-core (>= $(RVERS)), r-base-core (<< 3.5.0)" >> $(CURDIR)/debian/rkward.substvars ; \
else \
if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
@@ -63,4 +60,4 @@ override_dh_shlibdeps:
else \
if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "9" ] ; then \
echo "rvers=r-base-core (<< 2.14.0), r-base-core (>= 2.9.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- fi; fi; fi; fi;
+ fi; fi; fi; fi; fi
More information about the rkward-tracker
mailing list