From b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 19:40:22 +0200 Subject: Merging debian version 6.7.7-1. Signed-off-by: Daniel Baumann --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b3e901a39e..5d76443b53 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,6 @@ maintainerclean: # We cannot use dh_clean here because it requires debian/control to exist rm -rf debian/.debhelper debian/*.debhelper* debian/files debian/generated.* rm -f \ - debian/config.defines.dump \ debian/control \ debian/control.md5sum \ debian/linux-doc.maintscript \ @@ -123,7 +122,7 @@ clean: debian/control dh_clean CONTROL_FILES = $(BUILD_DIR)/version-info $(wildcard debian/templates/*.in) -CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines) +CONTROL_FILES += debian/config/defines.toml $(wildcard debian/config/*/defines.toml) CONTROL_FILES += debian/installer/package-list # debian/bin/gencontrol.py uses debian/changelog as input, but the @@ -132,7 +131,8 @@ CONTROL_FILES += debian/installer/package-list # in the checksum. $(BUILD_DIR)/version-info: debian/changelog mkdir -p $(@D) - printf >$@ 'Source: %s\nVersion: %s\n' $(DEB_SOURCE) $(DEB_VERSION_SOURCE) +# Use DEB_VERSION_SOURCE to allow binNMU + printf >$@ 'Source: %s\nVersion: %s\n' $(DEB_SOURCE) $(DEB_VERSION) debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES) ifeq ($(wildcard debian/control.md5sum),) -- cgit v1.2.3