--- watchdog-5.15.orig/debian/changelog +++ watchdog-5.15/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. --- watchdog-5.15.orig/debian/control +++ watchdog-5.15/debian/control @@ -3,7 +3,7 @@ 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 --- watchdog-5.15.orig/debian/po/nl.po +++ watchdog-5.15/debian/po/nl.po @@ -45,9 +45,6 @@ #. 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/" --- watchdog-5.15.orig/debian/po/ru.po +++ watchdog-5.15/debian/po/ru.po @@ -44,17 +44,14 @@ #. 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 @@ "Укажите модули, которые нужно загрузить перед запуском watchdog. Модуль " "'softdog' обычно подходит для всех случаев. Введите 'none', если не хотите, " "чтобы сценарий загружал модуль." - --- watchdog-5.15.orig/debian/rules +++ watchdog-5.15/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 @@ 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