[rkward] /: Some more modernizations
Thomas Friedrichsmeier
null at kde.org
Wed Apr 11 10:17:14 UTC 2018
Git commit 2097595e690e81b43b502c35751da8852194eeb2 by Thomas Friedrichsmeier.
Committed on 11/04/2018 at 10:17.
Pushed by tfry into branch 'master'.
Some more modernizations
M +1 -1 debian-official/compat
M +1 -1 debian-official/control
M +2 -4 debian-official/rules
M +2 -0 debian/changelog
https://commits.kde.org/rkward/2097595e690e81b43b502c35751da8852194eeb2
diff --git a/debian-official/compat b/debian-official/compat
index ec635144..b4de3947 100644
--- a/debian-official/compat
+++ b/debian-official/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian-official/control b/debian-official/control
index 5bf0a873..c9ddc76b 100644
--- a/debian-official/control
+++ b/debian-official/control
@@ -5,7 +5,7 @@ Maintainer: Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net>
Build-Depends: cmake,
extra-cmake-modules,
pkg-kde-tools | pkg-kf5-tools,
- debhelper (>= 9.0.0),
+ debhelper (>= 11.0.0),
libkf5webkit-dev,
libkf5texteditor-dev,
kdoctools-dev,
diff --git a/debian-official/rules b/debian-official/rules
index 79c167f6..b493c82e 100755
--- a/debian-official/rules
+++ b/debian-official/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)
@@ -31,7 +29,7 @@ override_dh_auto_configure:
-DR_EXECUTABLE=/usr/bin/R/ \
-DR_LIBDIR=/usr/lib/R/site-library/ \
-DCMAKE_SKIP_RPATH=YES \
- -DBUILD_TIMESTAMP="$(builttime)"
+ -DBUILD_TIMESTAMP="$(SOURCE_DATE_EPOCH)"
override_dh_auto_install:
dh_auto_install
diff --git a/debian/changelog b/debian/changelog
index d1ceb7e0..e84933d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ rkward (0.7.0-1) UNRELEASED; urgency=low
* Add lintian overrides for r-data-without-readme-source and
desktop-command-not-in-package
* Make rkward binary package depend on identical version rkward-data package
+ * Increase debhelper compat level to 11
+ * Use SOURCE_DATE_EPOCH for build timestamp, instead of parsing changelog
-- Thomas Friedrichsmeier <thomas.friedrichsmeier at kdemail.net> Fri, 06 Apr 2018 11:00:00 +0100
More information about the rkward-tracker
mailing list