[linux] 02/02: linux-libc-dev: Drop obsolete Replaces/Conflicts with linux-kernel-headers

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 7d4efba38e55667f5d2c37e462f12fd24a3b2b92
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 5 23:20:26 2016 +0100

    linux-libc-dev: Drop obsolete Replaces/Conflicts with linux-kernel-headers
    
    linux-kernel-headers was removed from unstable in 2007, so presumably
    was last released in etch.
    
    libkxl0-dev still depends on it, so don't remove the Provides yet.
---
 debian/changelog                     | 1 +
 debian/templates/control.libc-dev.in | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37e06b9..cf43e05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ linux (4.6.1-1~exp1) UNRELEASED; urgency=medium
     - kernel/printk: Don't try to print from IRQ/NMI region
     - mm: perform lru_add_drain_all() remotely
   * debian/control: Drop obsolete versioned Depends and Breaks
+  * linux-libc-dev: Drop obsolete Replaces/Conflicts with linux-kernel-headers
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 Jun 2016 18:33:11 +0100
 
diff --git a/debian/templates/control.libc-dev.in b/debian/templates/control.libc-dev.in
index ecc35c7..6e975e4 100644
--- a/debian/templates/control.libc-dev.in
+++ b/debian/templates/control.libc-dev.in
@@ -1,9 +1,8 @@
 Package: linux-libc-dev
 Section: devel
 Depends: ${misc:Depends}
+# Remove this Provides when #826519 is closed
 Provides: linux-kernel-headers
-Replaces: linux-kernel-headers
-Conflicts: linux-kernel-headers
 Multi-Arch: same
 Description: Linux support headers for userspace development
  This package provides userspaces headers from the Linux kernel.  These headers

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git