Revert "don't provide those virtual package names, rather rename the binary packages...

This reverts commit a3b18460d2bc428d0e8dc3a975ad0a9b36e227df.

See http://jenkins/job/linux-bootstrap/1/console

diff --git a/kernel-package-overlay/Control b/kernel-package-overlay/Control
index 7e895d9751f4d8bfde933d8727fdaed93c9bc0eb..ddad73833108ed85d1c2b87829d82caa3a8d2b1b 100644 (file)
--- a/kernel-package-overlay/Control
+++ b/kernel-package-overlay/Control
@@ -23,11 +23,11 @@ Description: Header files related to Linux kernel, specifically,
  /usr/share/doc/=ST-headers-=V/debian.README.gz
  for details
 
-Package: =ST-source-PB_FLAVOUR
+Package: =ST-source-=V
 Architecture: all
 Section: devel
 Priority: optional
-Provides: =ST-source, =ST-source-=CV, =ST-source-=V
+Provides: =ST-source, =ST-source-=CV,  =ST-source-PB_FLAVOUR
 Depends: binutils, bzip2, file
 Recommends: libc6-dev | libc-dev, gcc | c-compiler, make (>= 3.80-10), po-debconf, gettext, binutils (>= 2.12), util-linux (>= 2.10o), module-init-tools (>= 0.9.10), debianutils (>= 2.30)
 Suggests: libncurses-dev | ncurses-dev, kernel-package, xmlto, libdb3-dev, libncurses-dev, docbook-utils, e2fsprogs (>= 1.29), linux-initramfs-tool, ksymoops
@@ -48,11 +48,11 @@ Description: Linux kernel source for version =V
  which has been designed to ease the task of creating kernel image
  packages. 
 
-Package: =ST-image-PB_FLAVOUR
+Package: =ST-image-=V=SA
 Architecture: =A
 Section: kernel
 Priority: optional
-Provides: =ST-image,  =ST-image-=CV,  =ST-image-=V=SA
+Provides: =ST-image,  =ST-image-=CV,  =ST-image-PB_FLAVOUR
 Pre-Depends: debconf (>= 0.2.17) | debconf-2.0
 Depends: =I coreutils (>= 5.96)
 Suggests: fdutils, =ST-doc-=V=SA | =ST-source-=V, ksymoops, =ST-image-=V=SA-dbg
@@ -71,12 +71,12 @@ Description: Linux kernel binary image for version =V=SA
  for details on how to tailor the  installation of this or any other kernel 
  image package
 
-Package: =ST-image-PB_FLAVOUR-debug
+Package: =ST-image-=V=SA-dbg
 Architecture: =A 
 Section: debug
 Priority: optional 
 Depends: =ST-image-=V=SA
-Provides: =ST-debug,  =ST-debug-=CV, =ST-debug-=V=SA, =ST-image-=V=SA-dbg
+Provides: =ST-debug,  =ST-debug-=CV, =ST-debug-=V=SA, =ST-image-PB_FLAVOUR-debug
 Suggests: systemtap
 Description: Linux kernel debug image for version =V=SA 
  This package contains the Linux kernel debug image for version