Bug#910959: grub-cloud-amd64: missing Conflicts: grub-coreboot, grub-efi-ia32, grub-ieee1275, grub-xen

[Bastian Blank]

Hi grub maintainers

On Sun, Oct 14, 2018 at 06:40:44PM +0200, Bastian Blank wrote:
> On Sat, Oct 13, 2018 at 09:33:26PM +0200, Andreas Beckmann wrote:
> > Here is a list of files that are known to be shared by both packages
> > (according to the Contents file for sid/amd64, which may be
> > slightly out of sync):
> > 
> > etc/kernel/postinst.d/zz-update-grub
> > etc/kernel/postrm.d/zz-update-grub
> 
> Is there are particular compelling reason why this files needs to be
> duplicated in all grub-* packages, instead of residing in
> grub(2)-common?  They are not even different from each other.

No answer is also an answer.  So there is no real reason.

> Given that it seems like this conflict is the only reason why two
> variants are not cross-installable.

Attached is a patch to move the two files to grub2-common.  I intend to
upload this in a few days.

Bastian

-- 
Where there's no emotion, there's no motive for violence.
		-- Spock, "Dagger of the Mind", stardate 2715.1
-------------- next part --------------
diff -Nru grub2-2.02+dfsg1/debian/changelog grub2-2.02+dfsg1/debian/changelog
--- grub2-2.02+dfsg1/debian/changelog	2018-08-28 15:17:21.000000000 +0000
+++ grub2-2.02+dfsg1/debian/changelog	2018-10-22 15:12:11.000000000 +0000
@@ -1,3 +1,11 @@
+grub2 (2.02+dfsg1-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move kernel maintainer script snippets into grub2-common.
+    (closes: #910959)
+
+ -- Bastiab Blank <waldi at debian.org>  Mon, 22 Oct 2018 15:12:11 +0000
+
 grub2 (2.02+dfsg1-6) unstable; urgency=medium
 
   * Only build *-signed packages on their native architecture for now, since
diff -Nru grub2-2.02+dfsg1/debian/control grub2-2.02+dfsg1/debian/control
--- grub2-2.02+dfsg1/debian/control	2018-08-28 15:17:05.000000000 +0000
+++ grub2-2.02+dfsg1/debian/control	2018-10-22 15:12:11.000000000 +0000
@@ -89,9 +89,31 @@
 # of the package is not very useful in a utilities-only build.
 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64
 Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
-Replaces: grub, grub-legacy, ${legacy-doc-br}, grub-common (<< 1.99-1), grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.99-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4)
+Replaces: grub, grub-legacy, ${legacy-doc-br}, grub-common (<< 1.99-1),
+  grub-pc (<< 2.02+dfsg1-6.1),
+  grub-coreboot (<< 2.02+dfsg1-6.1),
+  grub-efi-ia32 (<< 2.02+dfsg1-6.1),
+  grub-efi-amd64 (<< 2.02+dfsg1-6.1),
+  grub-efi-ia64 (<< 2.02+dfsg1-6.1),
+  grub-efi-arm (<< 2.02+dfsg1-6.1),
+  grub-efi-arm64 (<< 2.02+dfsg1-6.1),
+  grub-ieee1275 (<< 2.02+dfsg1-6.1),
+  grub-uboot (<< 2.02+dfsg1-6.1),
+  grub-xen (<< 2.02+dfsg1-6.1),
+  grub-yeeloong (<< 2.02+dfsg1-6.1),
 Conflicts: grub-legacy
-Breaks: grub (<< 0.97-54), ${legacy-doc-br}, shim (<< 0.9+1474479173.6c180c6-0ubuntu1~)
+Breaks: grub (<< 0.97-54), ${legacy-doc-br}, shim (<< 0.9+1474479173.6c180c6-0ubuntu1~),
+  grub-pc (<< 2.02+dfsg1-6.1),
+  grub-coreboot (<< 2.02+dfsg1-6.1),
+  grub-efi-ia32 (<< 2.02+dfsg1-6.1),
+  grub-efi-amd64 (<< 2.02+dfsg1-6.1),
+  grub-efi-ia64 (<< 2.02+dfsg1-6.1),
+  grub-efi-arm (<< 2.02+dfsg1-6.1),
+  grub-efi-arm64 (<< 2.02+dfsg1-6.1),
+  grub-ieee1275 (<< 2.02+dfsg1-6.1),
+  grub-uboot (<< 2.02+dfsg1-6.1),
+  grub-xen (<< 2.02+dfsg1-6.1),
+  grub-yeeloong (<< 2.02+dfsg1-6.1),
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files for version 2)
  This package contains common files shared by the distinct flavours of GRUB.
diff -Nru grub2-2.02+dfsg1/debian/grub2-common.install grub2-2.02+dfsg1/debian/grub2-common.install
--- grub2-2.02+dfsg1/debian/grub2-common.install	2018-07-30 12:32:56.000000000 +0000
+++ grub2-2.02+dfsg1/debian/grub2-common.install	2018-10-22 15:12:11.000000000 +0000
@@ -1,5 +1,7 @@
 ../../debian/default			usr/share/grub
 ../../debian/update-grub		usr/sbin
+../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
+../../debian/kernel/zz-update-grub	etc/kernel/postrm.d
 
 usr/sbin/grub-install
 usr/sbin/grub-reboot
diff -Nru grub2-2.02+dfsg1/debian/install.in grub2-2.02+dfsg1/debian/install.in
--- grub2-2.02+dfsg1/debian/install.in	2018-07-30 12:32:56.000000000 +0000
+++ grub2-2.02+dfsg1/debian/install.in	2018-10-22 15:12:11.000000000 +0000
@@ -1,2 +0,0 @@
-../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
-../../debian/kernel/zz-update-grub	etc/kernel/postrm.d