From 62face90fe89ea1dc88b6b093f4921e47461f48d Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Fri, 20 Jan 2017 14:02:17 +0100 Subject: [PATCH 07/10] Synced Debian files with 5.15-2 --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/po/nl.po | 3 --- debian/po/ru.po | 8 ++------ debian/rules | 9 +++++---- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd436d8..1559626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +watchdog (5.15-2) unstable; urgency=medium + + * Fix FTCBFS: Let dh_auto_configure pass --host to ./configure + (Closes: #851231) Thanks to Helmut Grohne + * Bumped Standards-Version to 3.9.8, no changes needed. + * Enabled bindnow linker flag. + + -- Michael Meskes Fri, 20 Jan 2017 13:31:26 +0100 + watchdog (5.15-1) unstable; urgency=medium * New upstream version. diff --git a/debian/control b/debian/control index a9f8a68..625f820 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Michael Meskes Build-Depends: debhelper (>= 9), po-debconf (>= 0.5.0), dh-systemd (>= 1.5) -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://watchdog.sourceforge.net Package: watchdog diff --git a/debian/po/nl.po b/debian/po/nl.po index 9f9d657..73d1d28 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -45,9 +45,6 @@ msgstr "Na het stoppen van watchdog wd_keepalive starten?" #. Type: boolean #. Description #: ../templates:3001 -#| msgid "" -#| "Please specify whether watchdog should be started as part of the boot " -#| "process. This can be changed later by editing /etc/default/watchdog." msgid "" "Please specify whether stopping watchdog should start wd_keepalive to keep " "on triggering the watchdog device. This can be changed later by editing /etc/" diff --git a/debian/po/ru.po b/debian/po/ru.po index 6b2208c..211e4d8 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -44,17 +44,14 @@ msgstr "Запускать wd_keepalive после остановки watchdog?" #. Type: boolean #. Description #: ../templates:3001 -#| msgid "" -#| "Please specify whether watchdog should be started as part of the boot " -#| "process. This can be changed later by editing /etc/default/watchdog." msgid "" "Please specify whether stopping watchdog should start wd_keepalive to keep " "on triggering the watchdog device. This can be changed later by editing /etc/" "default/watchdog." msgstr "" "Укажите, нужно ли при остановке watchdog запускать wd_keepalive, чтобы " -"оставить рабочим устройство watchdog. Это можно " -"изменить позже отредактировав файл /etc/default/watchdog." +"оставить рабочим устройство watchdog. Это можно изменить позже " +"отредактировав файл /etc/default/watchdog." #. Type: boolean #. Description @@ -91,4 +88,3 @@ msgstr "" "Укажите модули, которые нужно загрузить перед запуском watchdog. Модуль " "'softdog' обычно подходит для всех случаев. Введите 'none', если не хотите, " "чтобы сценарий загружал модуль." - diff --git a/debian/rules b/debian/rules index 2ca0797..0ece076 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,10 @@ #!/usr/bin/make -f SHELL = /bin/bash -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +export DEB_BUILD_MAINT_OPTIONS=hardening=+all +CFLAGS = `dpkg-buildflags --get CFLAGS` +CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` +LDFLAGS = `dpkg-buildflags --get LDFLAGS` build: build-arch build-indep build-arch: build-stamp @@ -14,7 +15,7 @@ build-stamp: Makefile touch build Makefile: - CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --prefix=/usr \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" dh_auto_configure -- \ --with-configfile=/etc/watchdog.conf clean: Makefile -- 2.20.1