Merge branch 'rename-helpers' into 'master'

Rename all the packages containg the helper binaries

See merge request efi-team/shim!2

12 files changed, 19 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 6dc54b7d..c0d0ab1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ shim (15+1533136590.3beb971-3) UNRELEASED; urgency=medium
   [ Steve McIntyre ]
   * Change maintenance address to be the EFI team
   * Add me and vorlon to the Uploaders list
+  * Rename the helper binary packages to shim-helpers-$arch.
 
- -- Luca Boccassi <bluca@debian.org>  Fri, 15 Feb 2019 19:50:10 +0000
+ -- Steve McIntyre <93sam@debian.org>  Wed, 06 Mar 2019 22:35:52 +0000
 
 shim (15+1533136590.3beb971-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e713ee21..bedff821 100644
--- a/debian/control
+++ b/debian/control
@@ -20,23 +20,23 @@ Description: boot loader to chain-load signed boot loaders under Secure Boot
  infrequently-changing binary to be signed by the UEFI CA, while allowing
  an OS distributor to revision their main bootloader independently of the CA.
 
-Package: shim-amd64-signed-template
+Package: shim-helpers-amd64-signed-template
 Architecture: amd64
 Depends: ${misc:Depends},
 Description: boot loader to chain-load signed boot loaders (signing template)
- This package contains template files for shim-amd64-signed.
+ This package contains template files for shim-helpers-amd64-signed.
  This is only needed for Secure Boot signing.
 
-Package: shim-i386-signed-template
+Package: shim-helpers-i386-signed-template
 Architecture: i386
 Depends: ${misc:Depends},
 Description: boot loader to chain-load signed boot loaders (signing template)
- This package contains template files for shim-i386-signed.
+ This package contains template files for shim-helpers-i386-signed.
  This is only needed for Secure Boot signing.
 
-Package: shim-arm64-signed-template
+Package: shim-helpers-arm64-signed-template
 Architecture: arm64
 Depends: ${misc:Depends},
 Description: boot loader to chain-load signed boot loaders (signing template)
- This package contains template files for shim-arm64-signed.
+ This package contains template files for shim-helpers-arm64-signed.
  This is only needed for Secure Boot signing.
diff --git a/debian/shim-amd64-signed-template.lintian-overrides b/debian/shim-amd64-signed-template.lintian-overrides
deleted file mode 100644
index 96e97d24..00000000
--- a/debian/shim-amd64-signed-template.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-shim-amd64-signed-template: missing-dep-for-interpreter
diff --git a/debian/shim-arm64-signed-template.lintian-overrides b/debian/shim-arm64-signed-template.lintian-overrides
deleted file mode 100644
index a5478bb3..00000000
--- a/debian/shim-arm64-signed-template.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-shim-arm64-signed-template: missing-dep-for-interpreter
diff --git a/debian/shim-helpers-amd64-signed-template.lintian-overrides b/debian/shim-helpers-amd64-signed-template.lintian-overrides
new file mode 100644
index 00000000..e894fa95
--- /dev/null
+++ b/debian/shim-helpers-amd64-signed-template.lintian-overrides
@@ -0,0 +1 @@
+shim-helpers-amd64-signed-template: missing-dep-for-interpreter
diff --git a/debian/shim-helpers-arm64-signed-template.lintian-overrides b/debian/shim-helpers-arm64-signed-template.lintian-overrides
new file mode 100644
index 00000000..adb0fa91
--- /dev/null
+++ b/debian/shim-helpers-arm64-signed-template.lintian-overrides
@@ -0,0 +1 @@
+shim-helpers-arm64-signed-template: missing-dep-for-interpreter
diff --git a/debian/shim-helpers-i386-signed-template.lintian-overrides b/debian/shim-helpers-i386-signed-template.lintian-overrides
new file mode 100644
index 00000000..8833480b
--- /dev/null
+++ b/debian/shim-helpers-i386-signed-template.lintian-overrides
@@ -0,0 +1 @@
+shim-helpers-i386-signed-template: missing-dep-for-interpreter
diff --git a/debian/shim-i386-signed-template.lintian-overrides b/debian/shim-i386-signed-template.lintian-overrides
deleted file mode 100644
index 41935bfc..00000000
--- a/debian/shim-i386-signed-template.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-shim-i386-signed-template: missing-dep-for-interpreter
diff --git a/debian/signing-template.generate b/debian/signing-template.generate
index cc842c14..63ba0f24 100755
--- a/debian/signing-template.generate
+++ b/debian/signing-template.generate
@@ -20,7 +20,7 @@ subst () {
 }
 
 template='./debian/signing-template'
-pkg_name="shim-${DEB_HOST_ARCH}-signed-template"
+pkg_name="shim-helpers-${DEB_HOST_ARCH}-signed-template"
 pkg_dir="debian/${pkg_name}/usr/share/code-signing/${pkg_name}"
 pkg_deb="${pkg_dir}/source-template/debian"
 
diff --git a/debian/signing-template/changelog.in b/debian/signing-template/changelog.in
index ca666d7d..f2e4ba69 100644
--- a/debian/signing-template/changelog.in
+++ b/debian/signing-template/changelog.in
@@ -1,10 +1,10 @@
-shim-@arch@-signed (1+@version_mangled@) @distribution@; urgency=@urgency@
+shim-helpers-@arch@-signed (1+@version_mangled@) @distribution@; urgency=@urgency@
 
   * Update to shim @version_binary@
 
  -- Debian signing service <ftpmaster@debian.org>  @date@
 
-shim-@arch@-signed (1) unstable; urgency=medium
+shim-helpers-@arch@-signed (1) unstable; urgency=medium
 
   * Add template source package for signing
 
diff --git a/debian/signing-template/control.in b/debian/signing-template/control.in
index a352242c..960d0091 100644
--- a/debian/signing-template/control.in
+++ b/debian/signing-template/control.in
@@ -1,14 +1,14 @@
-Source: shim-@arch@-signed
+Source: shim-helpers-@arch@-signed
 Section: admin
 Priority: optional
-Maintainer: Steve Langasek <vorlon@debian.org>
-Standards-Version: 3.9.8
+Maintainer: Debian EFI team <efi-team@lists.debian.org>
+Standards-Version: 4.3.0
 Build-Depends: debhelper (>= 10.1~),
  sbsigntool [amd64 arm64 i386],
  shim-unsigned (= @version_binary@),
 Rules-Requires-Root: no
 
-Package: shim-@arch@-signed
+Package: shim-helpers-@arch@-signed
 Architecture: @arch@
 Conflicts: shim (<< 15+1533136590.3beb971-3~),
 Replaces: shim (<< 15+1533136590.3beb971-3~),
diff --git a/debian/signing-template/copyright b/debian/signing-template/copyright
index 6d325cba..955ccbf8 100644
--- a/debian/signing-template/copyright
+++ b/debian/signing-template/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Comment:
- This file describes only the shim-signed source package.
+ This file describes only the shim-helpers-signed-* source package.
 
 Files: debian/signatures/*
 License: public-domain