summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog9
-rw-r--r--debian/signing-template/control.in3
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 690e8005..a1842de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+shim (15+1533136590.3beb971-6) UNRELEASED; urgency=medium
+
+ [ Steve McIntyre ]
+ * Add Provides: and Breaks: to shim-helpers-$arch-signed to fix
+ clashes with the old shim-signed package for fbx64.efi.signed and
+ mmx64.efi.signed. Closes: #924619
+
+ -- Steve McIntyre <93sam@debian.org> Sat, 23 Mar 2019 18:19:13 +0000
+
shim (15+1533136590.3beb971-5) unstable; urgency=medium
[ Ansgar Burchardt ]
diff --git a/debian/signing-template/control.in b/debian/signing-template/control.in
index 96664232..552dcf5d 100644
--- a/debian/signing-template/control.in
+++ b/debian/signing-template/control.in
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 10.1~),
Package: shim-helpers-@arch@-signed
Architecture: @arch@
Conflicts: shim (<< 15+1533136590.3beb971-3~),
-Replaces: shim (<< 15+1533136590.3beb971-3~),
+Replaces: shim (<< 15+1533136590.3beb971-3~), shim-signed (<< 1.29),
+Breaks: shim-signed (<< 1.29),
Depends: shim-unsigned (= @version_binary@), ${misc:Depends},
Built-Using: shim (= @version_binary@)
Description: boot loader to chain-load signed boot loaders (signed by Debian)