diff mbox

[Precise,SRU,linux-meta,1/2] UBUNTU: Move metapackages to Section: kernel

Message ID d60be1d40c530dcd126303dda535efd15787d2bc.1353424454.git.leann.ogasawara@canonical.com
State New
Headers show

Commit Message

Leann Ogasawara Nov. 20, 2012, 8:50 p.m. UTC 
From: Leann Ogasawara <leann.ogasawara@canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1074787

Packages built from linux-meta source are currently in Section:
metapackages. The original rationale for this was that Recommends were
handled differently for 'metapackages' (bug #114662).

This rationale no longer applies and has not for a long time (all
recommends are now installed by default). Instead, use of this section
causes all *dependencies* of the linux metapackages to be marked as
'manual', preventing them from ever being cleaned up by apt autoremoval.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 meta-source/debian/control.common          |   14 +++++++-------
 meta-source/debian/control.d/generic       |    6 +++---
 meta-source/debian/control.d/generic-pae   |    6 +++---
 meta-source/debian/control.d/highbank      |    6 +++---
 meta-source/debian/control.d/omap          |    6 +++---
 meta-source/debian/control.d/powerpc       |    6 +++---
 meta-source/debian/control.d/powerpc-smp   |    6 +++---
 meta-source/debian/control.d/powerpc64-smp |    6 +++---
 meta-source/debian/control.d/server        |    6 +++---
 meta-source/debian/control.d/virtual       |    8 ++++----
 10 files changed, 35 insertions(+), 35 deletions(-)
diff mbox

Patch

diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index 351861f..dd3f0ec 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -8,7 +8,7 @@  Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-precise-meta.git
 
 Package: linux
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image (= ${binary:Version})
 Description: Generic complete Linux kernel.
@@ -26,7 +26,7 @@  Description: Linux kernel source with Ubuntu patches
 
 Package: linux-image
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${generic-depends} (= ${binary:Version})
 Description: Generic Linux kernel image.
@@ -49,7 +49,7 @@  Description: Linux kernel crashdump setup for the latest generic kernel
 
 Package: linux-tools
 Architecture: i386 amd64 armel armhf
-Section: metapackages
+Section: kernel
 Depends: ${misc:Depends}, linux-tools-${kernel-abi-version}
 Description: Linux kernel versioned Tools
  This package will always depend on the latest Linux kernel versioned tools 
@@ -66,7 +66,7 @@  Description: Linux kernel versioned Tools
 #
 Package: linux-image-hwe-generic
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-generic [amd64], linux-image-generic-pae [i386]
 Description: Depends on the generic hardware enablement kernel image and headers.
@@ -75,7 +75,7 @@  Description: Depends on the generic hardware enablement kernel image and headers
 
 Package: linux-hwe-generic
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-hwe-generic, linux-headers-generic [amd64], linux-headers-generic-pae [i386]
 Description: Depends on the generic hardware enablement kernel image and headers.
@@ -84,7 +84,7 @@  Description: Depends on the generic hardware enablement kernel image and headers
 
 Package: linux-image-current-generic
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-hwe-generic
 Description: Depends on the most recently released generic kernel image and headers.
@@ -93,7 +93,7 @@  Description: Depends on the most recently released generic kernel image and head
 
 Package: linux-current-generic
 Architecture: i386 amd64 
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-hwe-generic
 Description: Depends on the most recently released generic kernel image and headers.
diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
index 77f8d17..8c10c3a 100644
--- a/meta-source/debian/control.d/generic
+++ b/meta-source/debian/control.d/generic
@@ -1,6 +1,6 @@ 
 Package: linux-headers-generic
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic
 Description: Generic Linux kernel headers
@@ -9,7 +9,7 @@  Description: Generic Linux kernel headers
 
 Package: linux-image-generic
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-firmware
 Description: Generic Linux kernel image
@@ -18,7 +18,7 @@  Description: Generic Linux kernel image
 
 Package: linux-generic
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-generic (= ${binary:Version})
 Description: Complete Generic Linux kernel
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
index 4f33b6b..69ed2b9 100644
--- a/meta-source/debian/control.d/generic-pae
+++ b/meta-source/debian/control.d/generic-pae
@@ -1,6 +1,6 @@ 
 Package: linux-headers-generic-pae
 Architecture: i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-pae
 Description: Generic Linux kernel headers
@@ -9,7 +9,7 @@  Description: Generic Linux kernel headers
 
 Package: linux-image-generic-pae
 Architecture: i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-pae, linux-firmware
 Description: Generic Linux kernel image
@@ -18,7 +18,7 @@  Description: Generic Linux kernel image
 
 Package: linux-generic-pae
 Architecture: i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-generic-pae (= ${binary:Version})
 Description: Complete Generic Linux kernel
diff --git a/meta-source/debian/control.d/highbank b/meta-source/debian/control.d/highbank
index 0f700e6..478e75c 100644
--- a/meta-source/debian/control.d/highbank
+++ b/meta-source/debian/control.d/highbank
@@ -1,6 +1,6 @@ 
 Package: linux-headers-highbank
 Architecture: armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-highbank 
 Description: Linux kernel headers for the Calxeda Highbank flavour.
@@ -9,7 +9,7 @@  Description: Linux kernel headers for the Calxeda Highbank flavour.
 
 Package: linux-image-highbank
 Architecture: armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-highbank, linux-firmware
 Description: Linux kernel image for the Calxeda Highbank flavour.
@@ -18,7 +18,7 @@  Description: Linux kernel image for the Calxeda Highbank flavour.
 
 Package: linux-highbank
 Architecture: armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-highbank (= ${binary:Version})
 Description: Complete Linux kernel for the Calxeda Highbank architecture.
diff --git a/meta-source/debian/control.d/omap b/meta-source/debian/control.d/omap
index 4d59003..21c54e8 100644
--- a/meta-source/debian/control.d/omap
+++ b/meta-source/debian/control.d/omap
@@ -1,6 +1,6 @@ 
 Package: linux-headers-omap
 Architecture: armel armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-omap 
 Description: Linux kernel headers for the OMAP3 architecture.
@@ -9,7 +9,7 @@  Description: Linux kernel headers for the OMAP3 architecture.
 
 Package: linux-image-omap
 Architecture: armel armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-omap, linux-firmware
 Description: Linux kernel image for the OMAP3 architecture.
@@ -18,7 +18,7 @@  Description: Linux kernel image for the OMAP3 architecture.
 
 Package: linux-omap
 Architecture: armel armhf
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-omap (= ${binary:Version})
 Description: Complete Linux kernel for the OMAP3 architecture.
diff --git a/meta-source/debian/control.d/powerpc b/meta-source/debian/control.d/powerpc
index c1502f6..6176fea 100644
--- a/meta-source/debian/control.d/powerpc
+++ b/meta-source/debian/control.d/powerpc
@@ -3,7 +3,7 @@ 
 #
 Package: linux-powerpc
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-powerpc-smp (= ${binary:Version})
 Description: Complete Linux kernel on PowerPC.
@@ -12,7 +12,7 @@  Description: Complete Linux kernel on PowerPC.
 
 Package: linux-image-powerpc
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-image-powerpc-smp (= ${binary:Version}), linux-firmware
 Description: Linux kernel image on PowerPC
@@ -21,7 +21,7 @@  Description: Linux kernel image on PowerPC
 
 Package: linux-headers-powerpc
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-headers-powerpc-smp (= ${binary:Version})
 Description: Linux kernel headers on PowerPC
diff --git a/meta-source/debian/control.d/powerpc-smp b/meta-source/debian/control.d/powerpc-smp
index 8c6f8ff..1d64541 100644
--- a/meta-source/debian/control.d/powerpc-smp
+++ b/meta-source/debian/control.d/powerpc-smp
@@ -3,7 +3,7 @@ 
 #
 Package: linux-powerpc-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-image-powerpc-smp (= ${binary:Version})
 Description: Complete Linux kernel on PowerPC SMP.
@@ -13,7 +13,7 @@  Description: Complete Linux kernel on PowerPC SMP.
 
 Package: linux-image-powerpc-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-image-${kernel-abi-version}-powerpc-smp, linux-firmware
 Description: Linux kernel image on PowerPC SMP.
@@ -23,7 +23,7 @@  Description: Linux kernel image on PowerPC SMP.
 
 Package: linux-headers-powerpc-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-headers-${kernel-abi-version}-powerpc-smp
 Description: Linux kernel headers on PowerPC SMP
diff --git a/meta-source/debian/control.d/powerpc64-smp b/meta-source/debian/control.d/powerpc64-smp
index 3666ef4..c5e6053 100644
--- a/meta-source/debian/control.d/powerpc64-smp
+++ b/meta-source/debian/control.d/powerpc64-smp
@@ -3,7 +3,7 @@ 
 #
 Package: linux-powerpc64-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-image-powerpc64-smp (= ${binary:Version})
 Description: Complete Linux kernel on PowerPC64 SMP.
@@ -13,7 +13,7 @@  Description: Complete Linux kernel on PowerPC64 SMP.
 
 Package: linux-image-powerpc64-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-image-${kernel-abi-version}-powerpc64-smp, linux-firmware
 Description: Linux kernel image on PowerPC64 SMP.
@@ -23,7 +23,7 @@  Description: Linux kernel image on PowerPC64 SMP.
 
 Package: linux-headers-powerpc64-smp
 Architecture: powerpc
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: linux-headers-${kernel-abi-version}-powerpc64-smp
 Description: Linux kernel headers on PowerPC64 SMP
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
index 042e1a0..c2fa1be 100644
--- a/meta-source/debian/control.d/server
+++ b/meta-source/debian/control.d/server
@@ -1,6 +1,6 @@ 
 Package: linux-headers-server
 Architecture: amd64 i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic [amd64], linux-headers-generic-pae [i386]
 Description: Linux kernel headers on Server Equipment.
@@ -9,7 +9,7 @@  Description: Linux kernel headers on Server Equipment.
 
 Package: linux-image-server
 Architecture: amd64 i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic [amd64], linux-firmware [amd64], linux-image-generic-pae [i386]
 Description: Linux kernel image on Server Equipment.
@@ -18,7 +18,7 @@  Description: Linux kernel image on Server Equipment.
 
 Package: linux-server
 Architecture: amd64 i386
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-server (= ${binary:Version}) [amd64], linux-generic-pae [i386]
 Description: Complete Linux kernel on Server Equipment.
diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
index 219d201..5b276d5 100644
--- a/meta-source/debian/control.d/virtual
+++ b/meta-source/debian/control.d/virtual
@@ -1,6 +1,6 @@ 
 Package: linux-headers-virtual
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-virtual
 Description: Linux kernel headers for virtual machines
@@ -9,7 +9,7 @@  Description: Linux kernel headers for virtual machines
 
 Package: linux-image-virtual
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-virtual, linux-firmware
 Description: Linux kernel image for virtual machines
@@ -19,7 +19,7 @@  Description: Linux kernel image for virtual machines
 
 Package: linux-virtual
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-virtual (= ${binary:Version})
 Description: Complete Linux kernel for virtual machines
@@ -29,7 +29,7 @@  Description: Complete Linux kernel for virtual machines
 
 Package: linux-image-extra-virtual
 Architecture: i386 amd64
-Section: metapackages
+Section: kernel
 Priority: optional
 Depends: ${misc:Depends}, linux-image-virtual (= ${binary:Version}), linux-image-extra-${kernel-abi-version}-virtual
 Description: Linux kernel extra modules for virtual machines