UBUNTU: [Config] control file cleanup

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.snapdragon/control.d/flavour-control.stub b/debian.snapdragon/control.d/flavour-control.stub
index 96fd3a0bd3b394d7ff7f8384fc0a985b8fad5b1d..c263207f27d6e1b3c082a53dfbaf0fc4682a2d8e 100644 (file)
--- a/debian.snapdragon/control.d/flavour-control.stub
+++ b/debian.snapdragon/control.d/flavour-control.stub
@@ -28,8 +28,7 @@ Section: kernel
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
 Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES=
-Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6) | linux-initramfs-tool, kmod
-Conflicts: hotplug (<< 0.0.20040105-1)
+Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod
 Recommends: BOOTLOADER
 Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC
@@ -54,7 +53,7 @@ Architecture: ARCH
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends}
-Provides: linux-headers, linux-headers-3.0
+Provides: linux-headers
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on
  DESC.

diff --git a/debian.snapdragon/control.d/vars.snapdragon b/debian.snapdragon/control.d/vars.snapdragon
index b73b3e826f6c4e10e2b73d4774d7aa3748909f00..fc303d8f2766630ded3167060ce4af99ed2c9faa 100644 (file)
--- a/debian.snapdragon/control.d/vars.snapdragon
+++ b/debian.snapdragon/control.d/vars.snapdragon
@@ -2,5 +2,4 @@ arch="arm64"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"
+bootloader="flash-kernel"