[kernel] r11441 - in dists/trunk/linux-2.6/debian: . templates

[Maximilian Attems]

Author: maks
Date: Wed May 21 22:33:56 2008
New Revision: 11441

Log:
linux-libc-dev: Add a replaces for amd64-libs-dev.

> Both linux-kernel-headers in etch and amd64-libs-dev in sarge
> provide /usr/include/asm/bootsetup.h (among others), leading to a hiccup
> during sarge->etch upgrade if they are not upgraded in the right order.

a bit late not but better safe than sorry,
can be kicked after Lenny release.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.libc-dev.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May 21 22:33:56 2008
@@ -23,6 +23,7 @@
   * Enable TCP_MD5SIG for BGP sessions. (closes: #443742)
   * Add recognised alsa cards to bug report.
   * topconfig: Enable HYSDN, no longer broken on smp.
+  * linux-libc-dev: Add a replaces for amd64-libs-dev. (closes: #349706)
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Update the config to reflect upstream renaming this

Modified: dists/trunk/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Wed May 21 22:33:56 2008
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Provides: linux-kernel-headers
-Replaces: linux-kernel-headers
+Replaces: linux-kernel-headers, amd64-libs-dev (<< 1.4)
 Conflicts: linux-kernel-headers
 Description: Linux Kernel Headers for development
  This package provides headers from the Linux kernel.  These headers