Further abstraction of source package name.
 

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/control.d/flavour-control.stub | 12 ++++++------
debian.master/control.stub.in | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index a2d2a4d..3c41e61 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -21,12 +21,12 @@
#
# XXX: Leave the blank line before the first package!!

-Package: linux-image-PKGVER-ABINUM-FLAVOUR
+Package: SRCPKGNAME-image-PKGVER-ABINUM-FLAVOUR
Architecture: ARCH
Section: admin
Priority: optional
Pre-Depends: dpkg (>= 1.10.24)
-Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES=
+Provides: SRCPKGNAME-image, SRCPKGNAME-image-2.6, fuse-module, =PROVIDES=
Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
Conflicts: hotplug (<< 0.0.20040105-1)
Breaks: lvm2 (<< 2.02.54-1ubuntu3)
@@ -45,10 +45,10 @@ Description: Linux kernel image for version PKGVER on DESC
TARGET
.
You likely do not want to install this package directly. Instead, install
- the linux-FLAVOUR meta-package, which will ensure that upgrades work
+ the SRCPKGNAME-FLAVOUR meta-package, which will ensure that upgrades work
correctly, and that supporting packages are also installed.

-Package: linux-headers-PKGVER-ABINUM-FLAVOUR
+Package: SRCPKGNAME-headers-PKGVER-ABINUM-FLAVOUR
Architecture: ARCH
Section: devel
Priority: optional
@@ -61,12 +61,12 @@ Description: Linux kernel headers for version PKGVER on DESC
This is for sites that want the latest kernel headers. Please read
/usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details.

-Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
+Package: SRCPKGNAME-image-PKGVER-ABINUM-FLAVOUR-dbgsym
Architecture: ARCH
Section: devel
Priority: optional
Depends: ${misc:Depends}
-Provides: linux-debug
+Provides: SRCPKGNAME-debug
Description: Linux kernel debug image for version PKGVER on DESC
This package provides a kernel debug image for version PKGVER on
DESC.
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index d51aaba..6512c37 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -1,4 +1,4 @@
-Source: linux
+Source: SRCPKGNAME
Section: devel
Priority: optional
Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
@@ -28,7 +28,7 @@ Description: Linux kernel source for version PKGVER with Ubuntu patches
been designed to ease the task of creating kernel image packages.
.
If you are simply trying to build third-party modules for your kernel,
- you do not want this package. Install the appropriate linux-headers
+ you do not want this package. Install the appropriate SRCPKGNAME-headers
package instead.

Package: SRCPKGNAME-doc
@@ -55,7 +55,7 @@ Description: Linux kernel specific tools for version PKGVER
This package provides the architecture independent parts for kernel
version locked tools in the PKGVER kernel source.

-Package: linux-headers-PKGVER-ABINUM
+Package: SRCPKGNAME-headers-PKGVER-ABINUM
Architecture: all
Section: devel
Priority: optional
@@ -78,11 +78,11 @@ Description: Linux Kernel Headers for development
libraries. They are NOT meant to be used to build third-party modules for
your kernel. Use SRCPKGNAME-headers-* packages for that.

-Package: linux-tools-PKGVER-ABINUM
+Package: SRCPKGNAME-tools-PKGVER-ABINUM
Architecture: i386 amd64 ia64 powerpc sparc armel
Section: devel
Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
+Depends: ${misc:Depends}, ${shlibs:Depends}, SRCPKGNAME-tools-common
Description: Linux kernel tools for version PKGVER-ABINUM
This package provides the architecture dependant parts for kernel
version locked tools for version PKGVER-ABINUM on
--
1.7.0.4


--------------050908030201020309070609
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

--------------050908030201020309070609--