[Glibc-bsd-commits] r5640 - trunk/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-15 17:50:42 +0000 (Wed, 15 Oct 2014)
New Revision: 5640

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.flavor.in
Log:
Revert r5620;  restore the Breaks: on older GRUB now that (>> 2.02~)
has reached testing.


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2014-10-15 13:44:21 UTC (rev 5639)
+++ trunk/kfreebsd-10/debian/changelog	2014-10-15 17:50:42 UTC (rev 5640)
@@ -2,10 +2,6 @@
 
   * Actually apply changes to debian/control meant to happen in the
     previous upload (changes to Breaks: and Uploaders:)
-  * Don't yet set a Breaks: on grub-common (<< 2.02~), because newer
-    GRUB is not available yet in testing, and would make d-i unable to
-    install a bootloader at all.  Please add it back after GRUB 2.02
-    migrates as it will help to smooth partial upgrades.
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Thu, 09 Oct 2014 00:31:20 +0100
 

Modified: trunk/kfreebsd-10/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-10/debian/control.flavor.in	2014-10-15 13:44:21 UTC (rev 5639)
+++ trunk/kfreebsd-10/debian/control.flavor.in	2014-10-15 17:50:42 UTC (rev 5640)
@@ -8,8 +8,7 @@
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Breaks:
 # ZFS metadata now compressed with LZ4 by default;  requires recent GRUB
-# :XXX: please uncomment the following after GRUB 2.02 reaches testing
-# grub-common (<< 2.02~) [kfreebsd-any],
+grub-common (<< 2.02~) [kfreebsd-any],
 # AT_* macros break LD_PRELOAD (see #630695)
 # Missing support for RFTSIGZMB (see 007_clone_signals.diff)
  libc0.1 (<< 2.11.3-1) [kfreebsd-any],