From d8dc672de1c6b6778080c433cab4f35985bef338 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 27 May 2018 09:42:53 +0200 Subject: [PATCH] Don't use special copyright file for signing template --- debian/rules.real | 2 +- debian/signing_templates/copyright | 53 ----------------------------- debian/signing_templates/rules.real | 4 +-- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 debian/signing_templates/copyright diff --git a/debian/rules.real b/debian/rules.real index d8a8e3ada..68476a5c6 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -530,7 +530,7 @@ install-signed-template_$(ARCH): mkdir -p $(CODE_SIGNING_DIR) PYTHONHASHSEED=0 debian/bin/gencontrol_signed.py $(ARCH) cp -R debian/compat \ - debian/signing_templates/copyright \ + debian/copyright \ debian/signing_templates/README.source \ debian/signing_templates/rules \ debian/signing_templates/rules.real \ diff --git a/debian/signing_templates/copyright b/debian/signing_templates/copyright deleted file mode 100644 index 89c6ded73..000000000 --- a/debian/signing_templates/copyright +++ /dev/null @@ -1,53 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Comment: - This file describes only the linux-signed source package. Its binary - packages are built largely from source in the linux source package, - which is described by the file 'copyright.linux'. - -Files: debian/signatures/* -License: public-domain - Digital signatures and certificates are presumed not to be - copyrightable works, and no copyright is claimed for them. -Comment: - The signatures and certificates in this package cannot be regenerated - as-is without the associated private key material, but they can be - replaced using alternate private keys. - -Files: debian/rules -Copyright: 2016,2018 Debian kernel team -License: GPL-2 - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General Public - License version 2 can be found in `/usr/share/common-licenses/GPL-2'. - -Files: debian/* -Copyright: 2016,2018 Debian kernel team -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General Public - License version 2 can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/signing_templates/rules.real b/debian/signing_templates/rules.real index 50ea62080..4d08ef77c 100644 --- a/debian/signing_templates/rules.real +++ b/debian/signing_templates/rules.real @@ -45,9 +45,7 @@ install-signed: dh_install dh_installchangelogs dh_installdocs - cp /usr/share/doc/$(IMAGE_PACKAGE_NAME)/copyright \ - $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/copyright.linux - dh_compress -Xcopyright.linux + dh_compress dh_fixperms dh_installdeb # Copy most package relations and description from unsigned package