diff --git a/debian/changelog b/debian/changelog
index 8176c40..da080be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,16 @@
boinc-app-eah-brp (0.20170426+dfsg-14) UNRELEASED; urgency=medium
+ [ Steffen Moeller ]
* Minimisation of binary.
+ [ Debian Janitor ]
+ * Trim trailing whitespace.
+ * Bump debhelper from deprecated 9 to 13.
+ + debian/rules: Rely on default use of dh_missing rather than using
+ dh_install --list-missing.
+ * Set debhelper-compat version in Build-Depends.
+ * Use ?= for assignments to architecture variables.
+
-- Steffen Moeller <moeller@debian.org> Tue, 20 Feb 2018 18:29:33 +0100
boinc-app-eah-brp (0.20170426+dfsg-13) UNRELEASED; urgency=medium
@@ -35,7 +44,7 @@ boinc-app-eah-brp (0.20170426+dfsg-10) unstable; urgency=medium
* Wisdom creation script integrates FFTW version number in wisdom file.
* Application looks at /etc/fftw/brp.3.3.7.wisdomf for wisdom file (or
whatever the current version of the FFTW3 library may be at runtime).
-
+
-- Steffen Moeller <moeller@debian.org> Mon, 08 Jan 2018 13:32:44 +0100
boinc-app-eah-brp (0.20170426+dfsg-9) UNRELEASED; urgency=medium
@@ -71,7 +80,7 @@ boinc-app-eah-brp (0.20170426+dfsg-6) UNRELEASED; urgency=medium
boinc-app-eah-brp (0.20170426+dfsg-5) unstable; urgency=medium
- * Added -mfpmath=sse -msse for Intel builds found in
+ * Added -mfpmath=sse -msse for Intel builds found in
upstream's build script.
-- Steffen Moeller <moeller@debian.org> Sat, 23 Dec 2017 17:57:49 +0100
@@ -93,7 +102,7 @@ boinc-app-eah-brp (0.20170426+dfsg-3) UNRELEASED; urgency=medium
- Added runtime dependency on binutils.
- Simplified homepage to einsteinhome.org, away from source code
download.
- * debian/rules:
+ * debian/rules:
- Binary version set to 0.56.
- Preparing for adding details on Debian package to BOINC logs
* Adding log entry about if and which FFTW wisdom file is loaded
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index bb4a361..f8af1c4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel@lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller@debian.org>, Christian Dreihsig <christian.dreihsig@t-online.de>
-Build-Depends: debhelper (>= 9), libboinc-app-dev, libxml2-dev, libiberty-dev, libgsl-dev|libgsl0-dev,
- binutils-dev, libfftw3-dev, pkg-config, g++-5|g++ (<< 6)
+Build-Depends: debhelper-compat (= 13), libboinc-app-dev, libxml2-dev, libiberty-dev, libgsl-dev | libgsl0-dev,
+ binutils-dev, libfftw3-dev, pkg-config, g++-5 | g++ (<< 6)
# opencl-headers, boinc-app-eah-brp-clfft-dev
Standards-Version: 4.1.3
Homepage: https://einsteinathome.org/
diff --git a/debian/rules b/debian/rules
index c61ba64..af773ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,7 +147,7 @@ ifeq ($(DEB_TARGET_GNU_CPU),i686)
CFLAGS_APPEND += -mfpmath=sse -msse
endif
ifeq ($(DEB_TARGET_GNU_CPU),x86_64)
- #CFLAGS_APPEND += -mavx -msse3
+ #CFLAGS_APPEND += -mavx -msse3
CFLAGS_APPEND += -mfpmath=sse -msse
endif
endif
@@ -163,7 +163,7 @@ CFLAGS_APPEND += -DNOCHECKPOINTING
CFLAGS_APPEND += -DCOMMUNICATIONREDUCTION=250
-DEB_TARGET_ARCH_OS=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
+DEB_TARGET_ARCH_OS?=$(shell dpkg-architecture -qDEB_TARGET_ARCH_OS)
CXXFLAGS += $(CFLAGS_APPEND)
CXXFLAGS += -DDEBIAN_VERSION="\"$(DEBIAN_VERSION)\""
@@ -193,7 +193,7 @@ APP_INFO_VERSION = 56
%:
dh $@
-override_dh_auto_build:
+override_dh_auto_build:
ifeq (1,$(shell grep -c "^Package: boinc-app-eah-brp-opencl" debian/control))
@echo Peforming with Makefile.linux.opencl
$(MAKE) EINSTEINBINARY_TARGET=$(EINSTEINBINARY_TARGET_OPENCL) -f Makefile.linux.opencl release
@@ -205,10 +205,10 @@ endif
@echo "The size of the binary is:"
@wc -c $(EINSTEINBINARY_TARGET)
-override_dh_install:
+override_dh_install:
cat debian/extra/app_info.xml.in | perl -ne 'print unless /^#/' | \
sed -e 's/VERSION/$(APP_INFO_VERSION)/' > debian/extra/app_info.xml
- dh_install --list-missing
+ dh_install
override_dh_auto_clean:
$(MAKE) clean || echo "I: Make clean fails with no patches applied - please ignore"
