diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 013ea48c85..85c55f6a65 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -163,6 +163,7 @@ class PackagesBundle: package.meta['rules-check-packages'] = check_packages for name in ( + 'NEWS', 'bug-presubj', 'lintian-overrides', 'maintscript', diff --git a/debian/rules.real b/debian/rules.real index 7bdfdcf1a5..483e3d5934 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -402,7 +402,6 @@ endif binary_image_bug \ DESTDIR='$(DESTDIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)' dh_strip --no-automatic-dbgsym -Xvmlinux -Xvmlinuz - ln -sf linux-image.NEWS debian/$(PACKAGE_NAME).NEWS +$(MAKE_SELF) install-base binary_image_bug: @@ -499,7 +498,6 @@ binary_signed-template: chmod 755 $(DEBIAN_DIR)/rules cp -R debian/copyright \ debian/installer \ - debian/linux-image.NEWS \ $(CODE_SIGNING_DIR)/source-template/debian/ +$(MAKE_SELF) install-base diff --git a/debian/signing_templates/rules.real b/debian/signing_templates/rules.real index a68f44b71c..dfc84ebbe7 100644 --- a/debian/signing_templates/rules.real +++ b/debian/signing_templates/rules.real @@ -43,7 +43,6 @@ binary_image: $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info dh_install dh_installchangelogs - ln -sf linux-image.NEWS debian/$(PACKAGE_NAME).NEWS dh_installdocs dh_lintian dh_compress diff --git a/debian/templates/image-unsigned.NEWS.in b/debian/templates/image-unsigned.NEWS.in new file mode 120000 index 0000000000..e70f537c2f --- /dev/null +++ b/debian/templates/image-unsigned.NEWS.in @@ -0,0 +1 @@ +image.NEWS.in \ No newline at end of file diff --git a/debian/linux-image.NEWS b/debian/templates/image.NEWS.in similarity index 100% rename from debian/linux-image.NEWS rename to debian/templates/image.NEWS.in diff --git a/debian/templates/signed.image.NEWS.in b/debian/templates/signed.image.NEWS.in new file mode 120000 index 0000000000..e70f537c2f --- /dev/null +++ b/debian/templates/signed.image.NEWS.in @@ -0,0 +1 @@ +image.NEWS.in \ No newline at end of file