diff --git a/debian/changelog b/debian/changelog index 8e15427d9..d09b79586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low - regulator: Re-enable REGULATOR as built-in * [arm] thermal: Re-enable CPU_THERMAL as built-in (regression in 3.10~rc4-1~exp1) + * Stop providing virtual packages linux-image (Closes: #724569), + linux-headers and linux-source [ Ian Campbell ] * [armhf] Enable CONFIG_PCI for multiplatform flavour. diff --git a/debian/templates/control.headers.in b/debian/templates/control.headers.in index 1062709a7..060faff90 100644 --- a/debian/templates/control.headers.in +++ b/debian/templates/control.headers.in @@ -1,6 +1,5 @@ Package: linux-headers-@abiname@@localversion@ Depends: linux-headers-@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@, ${misc:Depends} -Provides: linux-headers Description: Header files for Linux @abiname@@localversion@ This package provides the architecture-specific kernel header files for Linux kernel @abiname@@localversion@, generally diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in index dbe808e46..3fecc2947 100644 --- a/debian/templates/control.image.type-plain.in +++ b/debian/templates/control.image.type-plain.in @@ -1,5 +1,5 @@ Package: linux-image-@abiname@@localversion@ -Provides: linux-image, linux-modules-@abiname@@localversion@ +Provides: linux-modules-@abiname@@localversion@ Pre-Depends: debconf | debconf-2.0 Depends: kmod | module-init-tools, linux-base (>= 3~), ${misc:Depends} Recommends: firmware-linux-free (>= 3~) diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 4229740bf..9df222f85 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -1,7 +1,6 @@ Package: linux-source-@version@ Architecture: all Section: kernel -Provides: linux-source Depends: binutils, bzip2, ${misc:Depends} Recommends: libc6-dev | libc-dev, gcc, make, bc Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config