diff -r -u linux-13.0/linux-2.6.31/debian/control linux-13.rename1/linux-2.6.31/debian/control --- linux-13.0/linux-2.6.31/debian/control 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian/control 2009-10-10 12:02:43.000000000 -0400 @@ -1,4 +1,4 @@ -Source: linux +Source: linux-bfs Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -8,11 +8,11 @@ Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-karmic.git -Package: linux-source-2.6.31 +Package: linux-bfs-source-2.6.31 Architecture: all Section: devel Priority: optional -Provides: linux-source, linux-source-2.6 +Provides: linux-bfs-source, linux-bfs-source-2.6 Depends: binutils, bzip2, coreutils | fileutils (>= 4.0) Recommends: libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev diff -r -u linux-13.0/linux-2.6.31/debian/control.stub linux-13.rename1/linux-2.6.31/debian/control.stub --- linux-13.0/linux-2.6.31/debian/control.stub 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian/control.stub 2009-10-10 12:02:43.000000000 -0400 @@ -1,4 +1,4 @@ -Source: linux +Source: linux-bfs Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -8,11 +8,11 @@ Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-karmic.git -Package: linux-source-2.6.31 +Package: linux-bfs-source-2.6.31 Architecture: all Section: devel Priority: optional -Provides: linux-source, linux-source-2.6 +Provides: linux-bfs-source, linux-bfs-source-2.6 Depends: binutils, bzip2, coreutils | fileutils (>= 4.0) Recommends: libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev @@ -683,5 +683,5 @@ Geared toward virtual machine guests. . You likely do not want to install this package directly. Instead, install - the linux-virtual meta-package, which will ensure that upgrades work + the linux-bfs-virtual meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -r -u linux-13.0/linux-2.6.31/debian.master/control linux-13.rename1/linux-2.6.31/debian.master/control --- linux-13.0/linux-2.6.31/debian.master/control 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control 2009-10-10 12:02:43.000000000 -0400 @@ -1,4 +1,4 @@ -Source: linux +Source: linux-bfs Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -8,11 +8,11 @@ Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-karmic.git -Package: linux-source-2.6.31 +Package: linux-bfs-source-2.6.31 Architecture: all Section: devel Priority: optional -Provides: linux-source, linux-source-2.6 +Provides: linux-bfs-source, linux-bfs-source-2.6 Depends: binutils, bzip2, coreutils | fileutils (>= 4.0) Recommends: libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev @@ -683,5 +683,5 @@ Geared toward virtual machine guests. . You likely do not want to install this package directly. Instead, install - the linux-virtual meta-package, which will ensure that upgrades work + the linux-bfs-virtual meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -r -u linux-13.0/linux-2.6.31/debian.master/control.d/flavour-control.stub linux-13.rename1/linux-2.6.31/debian.master/control.d/flavour-control.stub --- linux-13.0/linux-2.6.31/debian.master/control.d/flavour-control.stub 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control.d/flavour-control.stub 2009-10-10 12:05:50.000000000 -0400 @@ -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: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: BOOTLOADER @@ -44,27 +44,27 @@ 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 -Depends: coreutils | fileutils (>= 4.0), linux-headers-PKGVER-ABINUM, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends} +Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6 Description: Linux kernel headers for version PKGVER on DESC This package provides kernel header files for version PKGVER on DESC. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details. + /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details. -Package: linux-image-debug-PKGVER-ABINUM-FLAVOUR +Package: SRCPKGNAME-image-debug-PKGVER-ABINUM-FLAVOUR Architecture: ARCH Section: devel Priority: optional -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 -r -u linux-13.0/linux-2.6.31/debian.master/control-scripts/headers-postinst linux-13.rename1/linux-2.6.31/debian.master/control-scripts/headers-postinst --- linux-13.0/linux-2.6.31/debian.master/control-scripts/headers-postinst 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control-scripts/headers-postinst 2009-10-10 12:02:43.000000000 -0400 @@ -23,7 +23,7 @@ # Predefined values: my $version = "=V"; my $kimage = "=K"; -my $package_name = "linux-image-$version"; +my $package_name = "linux-bfs-image-$version"; # Ignore all invocations uxcept when called on to configure. diff -r -u linux-13.0/linux-2.6.31/debian.master/control-scripts/postinst linux-13.rename1/linux-2.6.31/debian.master/control-scripts/postinst --- linux-13.0/linux-2.6.31/debian.master/control-scripts/postinst 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control-scripts/postinst 2009-10-10 12:02:43.000000000 -0400 @@ -35,7 +35,7 @@ my $kernel_arch = "=B"; my $ramdisk = "/usr/sbin/update-initramfs"; # List of tools to create initial ram fs. my $notifier = "/usr/share/update-notifier/notify-reboot-required"; -my $package_name = "linux-image-$version"; +my $package_name = "linux-bfs-image-$version"; my $explicit_do_loader = 'Yes'; my $Loader = "NoLOADER"; # diff -r -u linux-13.0/linux-2.6.31/debian.master/control-scripts/postrm linux-13.rename1/linux-2.6.31/debian.master/control-scripts/postrm --- linux-13.0/linux-2.6.31/debian.master/control-scripts/postrm 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control-scripts/postrm 2009-10-10 12:02:43.000000000 -0400 @@ -50,7 +50,7 @@ my $force_build_link = ''; # we shall not create a dangling link my $kernel_arch = "=B"; my $ramdisk = "/usr/sbin/update-initramfs"; -my $package_name = "linux-image-$version"; +my $package_name = "linux-bfs-image-$version"; my $Loader = "NoLOADER"; # $Loader = "LILO" if $loader =~ /^lilo/io; diff -r -u linux-13.0/linux-2.6.31/debian.master/control-scripts/preinst linux-13.rename1/linux-2.6.31/debian.master/control-scripts/preinst --- linux-13.0/linux-2.6.31/debian.master/control-scripts/preinst 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control-scripts/preinst 2009-10-10 12:02:43.000000000 -0400 @@ -50,7 +50,7 @@ my $force_build_link = ''; # There is no harm in checking the link my $kernel_arch = "=B"; my $ramdisk = "/usr/sbin/update-initramfs"; # List of tools to create initial ram fs. -my $package_name = "linux-image-$version"; +my $package_name = "linux-bfs-image-$version"; my $Loader = "NoLOADER"; # $Loader = "LILO" if $loader =~ /^lilo/io; diff -r -u linux-13.0/linux-2.6.31/debian.master/control-scripts/prerm linux-13.rename1/linux-2.6.31/debian.master/control-scripts/prerm --- linux-13.0/linux-2.6.31/debian.master/control-scripts/prerm 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control-scripts/prerm 2009-10-10 12:02:43.000000000 -0400 @@ -45,7 +45,7 @@ my $force_build_link = ''; # There is no harm in checking the link my $kernel_arch = "=B"; my $ramdisk = "/usr/sbin/update-initramfs"; -my $package_name = "linux-image-$version"; +my $package_name = "linux-bfs-image-$version"; my $Loader = "NoLOADER"; # $Loader = "LILO" if $loader =~ /^lilo/io; @@ -87,8 +87,8 @@ my $WouldInvalidate = 0; if ($ARGV[0] && ($ARGV[0] =~ /remove/ || $ARGV[0] =~ /upgrade/)) { - if (-l "/usr/doc/linux-image-$version") { - unlink "/usr/doc/linux-image-$version"; + if (-l "/usr/doc/linux-bfs-image-$version") { + unlink "/usr/doc/linux-bfs-image-$version"; } } diff -r -u linux-13.0/linux-2.6.31/debian.master/control.stub linux-13.rename1/linux-2.6.31/debian.master/control.stub --- linux-13.0/linux-2.6.31/debian.master/control.stub 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control.stub 2009-10-10 12:09:21.000000000 -0400 @@ -1,4 +1,4 @@ -Source: linux +Source: linux-bfs Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -8,11 +8,11 @@ Build-Conflicts: findutils (= 4.4.1-1ubuntu1) Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-karmic.git -Package: linux-source-2.6.31 +Package: linux-bfs-source-2.6.31 Architecture: all Section: devel Priority: optional -Provides: linux-source, linux-source-2.6 +Provides: linux-bfs-source, linux-bfs-source-2.6 Depends: binutils, bzip2, coreutils | fileutils (>= 4.0) Recommends: libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev @@ -28,54 +28,54 @@ 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 linux-bfs-headers package instead. -Package: linux-doc +Package: linux-bfs-doc Architecture: all Section: doc Priority: optional -Conflicts: linux-doc-2.6 -Replaces: linux-doc-2.6 +Conflicts: linux-bfs-doc-2.6 +Replaces: linux-bfs-doc-2.6 Description: Linux kernel specific documentation for version 2.6.31 This package provides the various documents in the 2.6.31 kernel Documentation/ subdirectory. These document kernel subsystems, APIs, device drivers, and so on. See - /usr/share/doc/linux-doc/00-INDEX for a list of what is + /usr/share/doc/linux-bfs-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-2.6.31-13 +Package: linux-bfs-headers-2.6.31-13 Architecture: all Section: devel Priority: optional Depends: coreutils | fileutils (>= 4.0) -Provides: linux-headers, linux-headers-2.6 +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Header files related to Linux kernel version 2.6.31 This package provides kernel header files for version 2.6.31, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details -Package: linux-libc-dev +Package: linux-bfs-libc-dev Architecture: i386 amd64 lpia ia64 powerpc sparc -Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), linux-kernel-headers -Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), linux-kernel-headers, libdrm-dev -Provides: linux-kernel-headers +Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), linux-bfs-kernel-headers, linux-libc-dev +Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), linux-bfs-kernel-headers, libdrm-dev, linux-libc-dev +Provides: linux-bfs-kernel-headers, linux-libc-dev Description: Linux Kernel Headers for development This package provides headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. They are NOT meant to be used to build third-party modules for - your kernel. Use linux-headers-* packages for that. + your kernel. Use linux-bfs-headers-* packages for that. -Package: linux-image-2.6.31-13-386 +Package: linux-bfs-image-2.6.31-13-386 Architecture: i386 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, kvm-api-4, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on i386 This package contains the Linux kernel image for version 2.6.31 on i386. @@ -89,27 +89,27 @@ Geared toward desktop systems. . You likely do not want to install this package directly. Instead, install - the linux-386 meta-package, which will ensure that upgrades work + the linux-bfs-386 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-386 +Package: linux-bfs-headers-2.6.31-13-386 Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on i386 This package provides kernel header files for version 2.6.31 on i386. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-386 +Package: linux-bfs-image-debug-2.6.31-13-386 Architecture: i386 Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on i386 This package provides a kernel debug image for version 2.6.31 on i386. @@ -120,16 +120,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-generic +Package: linux-bfs-image-2.6.31-13-generic Architecture: i386 amd64 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9 +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9 Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on x86/x86_64 This package contains the Linux kernel image for version 2.6.31 on x86/x86_64. @@ -143,27 +143,27 @@ Geared toward desktop systems. . You likely do not want to install this package directly. Instead, install - the linux-generic meta-package, which will ensure that upgrades work + the linux-bfs-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-generic +Package: linux-bfs-headers-2.6.31-13-generic Architecture: i386 amd64 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on x86/x86_64 This package provides kernel header files for version 2.6.31 on x86/x86_64. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-generic +Package: linux-bfs-image-debug-2.6.31-13-generic Architecture: i386 amd64 Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on x86/x86_64 This package provides a kernel debug image for version 2.6.31 on x86/x86_64. @@ -174,16 +174,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-generic-pae +Package: linux-bfs-image-2.6.31-13-generic-pae Architecture: i386 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9 +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9 Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on x86 This package contains the Linux kernel image for version 2.6.31 on x86. @@ -197,27 +197,27 @@ Geared toward 32 bit desktop systems with more then 4GB RAM. . You likely do not want to install this package directly. Instead, install - the linux-generic-pae meta-package, which will ensure that upgrades work + the linux-bfs-generic-pae meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-generic-pae +Package: linux-bfs-headers-2.6.31-13-generic-pae Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on x86 This package provides kernel header files for version 2.6.31 on x86. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-generic-pae +Package: linux-bfs-image-debug-2.6.31-13-generic-pae Architecture: i386 Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on x86 This package provides a kernel debug image for version 2.6.31 on x86. @@ -228,16 +228,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-ia64 +Package: linux-bfs-image-2.6.31-13-ia64 Architecture: ia64 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: elilo (>= 3.6-1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on IA-64 SMP This package contains the Linux kernel image for version 2.6.31 on IA-64 SMP. @@ -251,27 +251,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-ia64 meta-package, which will ensure that upgrades work + the linux-bfs-ia64 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-ia64 +Package: linux-bfs-headers-2.6.31-13-ia64 Architecture: ia64 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on IA-64 SMP This package provides kernel header files for version 2.6.31 on IA-64 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-ia64 +Package: linux-bfs-image-debug-2.6.31-13-ia64 Architecture: ia64 Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on IA-64 SMP This package provides a kernel debug image for version 2.6.31 on IA-64 SMP. @@ -282,16 +282,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-lpia +Package: linux-bfs-image-2.6.31-13-lpia Architecture: lpia Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, kvm-api-4, redhat-cluster-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on Intel Atom processors This package contains the Linux kernel image for version 2.6.31 on Intel Atom processors. @@ -305,27 +305,27 @@ Geared toward LPIA-based mobile devices . You likely do not want to install this package directly. Instead, install - the linux-lpia meta-package, which will ensure that upgrades work + the linux-bfs-lpia meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-lpia +Package: linux-bfs-headers-2.6.31-13-lpia Architecture: lpia Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on Intel Atom processors This package provides kernel header files for version 2.6.31 on Intel Atom processors. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-lpia +Package: linux-bfs-image-debug-2.6.31-13-lpia Architecture: lpia Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on Intel Atom processors This package provides a kernel debug image for version 2.6.31 on Intel Atom processors. @@ -336,16 +336,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-powerpc +Package: linux-bfs-image-2.6.31-13-powerpc Architecture: powerpc Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on 32-bit PowerPC This package contains the Linux kernel image for version 2.6.31 on 32-bit PowerPC. @@ -359,27 +359,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-powerpc meta-package, which will ensure that upgrades work + the linux-bfs-powerpc meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-powerpc +Package: linux-bfs-headers-2.6.31-13-powerpc Architecture: powerpc Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on 32-bit PowerPC This package provides kernel header files for version 2.6.31 on 32-bit PowerPC. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-powerpc +Package: linux-bfs-image-debug-2.6.31-13-powerpc Architecture: powerpc Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on 32-bit PowerPC This package provides a kernel debug image for version 2.6.31 on 32-bit PowerPC. @@ -390,16 +390,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-powerpc-smp +Package: linux-bfs-image-2.6.31-13-powerpc-smp Architecture: powerpc Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on 32-bit PowerPC SMP This package contains the Linux kernel image for version 2.6.31 on 32-bit PowerPC SMP. @@ -413,27 +413,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-powerpc-smp meta-package, which will ensure that upgrades work + the linux-bfs-powerpc-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-powerpc-smp +Package: linux-bfs-headers-2.6.31-13-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on 32-bit PowerPC SMP This package provides kernel header files for version 2.6.31 on 32-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-powerpc-smp +Package: linux-bfs-image-debug-2.6.31-13-powerpc-smp Architecture: powerpc Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on 32-bit PowerPC SMP This package provides a kernel debug image for version 2.6.31 on 32-bit PowerPC SMP. @@ -444,16 +444,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-powerpc64-smp +Package: linux-bfs-image-2.6.31-13-powerpc64-smp Architecture: powerpc Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: yaboot -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on 64-bit PowerPC SMP This package contains the Linux kernel image for version 2.6.31 on 64-bit PowerPC SMP. @@ -467,27 +467,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-powerpc64-smp meta-package, which will ensure that upgrades work + the linux-bfs-powerpc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-powerpc64-smp +Package: linux-bfs-headers-2.6.31-13-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on 64-bit PowerPC SMP This package provides kernel header files for version 2.6.31 on 64-bit PowerPC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-powerpc64-smp +Package: linux-bfs-image-debug-2.6.31-13-powerpc64-smp Architecture: powerpc Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on 64-bit PowerPC SMP This package provides a kernel debug image for version 2.6.31 on 64-bit PowerPC SMP. @@ -498,16 +498,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-server +Package: linux-bfs-image-2.6.31-13-server Architecture: amd64 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, kvm-api-4, ivtv-modules, ndiswrapper-modules-1.9 +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, kvm-api-4, ivtv-modules, ndiswrapper-modules-1.9 Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on x86_64 This package contains the Linux kernel image for version 2.6.31 on x86_64. @@ -521,27 +521,27 @@ Geared toward 64 bit server systems. . You likely do not want to install this package directly. Instead, install - the linux-server meta-package, which will ensure that upgrades work + the linux-bfs-server meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-server +Package: linux-bfs-headers-2.6.31-13-server Architecture: amd64 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on x86_64 This package provides kernel header files for version 2.6.31 on x86_64. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-server +Package: linux-bfs-image-debug-2.6.31-13-server Architecture: amd64 Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on x86_64 This package provides a kernel debug image for version 2.6.31 on x86_64. @@ -552,16 +552,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-sparc64 +Package: linux-bfs-image-2.6.31-13-sparc64 Architecture: sparc Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: silo -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on 64-bit UltraSPARC This package contains the Linux kernel image for version 2.6.31 on 64-bit UltraSPARC. @@ -575,27 +575,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-sparc64 meta-package, which will ensure that upgrades work + the linux-bfs-sparc64 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-sparc64 +Package: linux-bfs-headers-2.6.31-13-sparc64 Architecture: sparc Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on 64-bit UltraSPARC This package provides kernel header files for version 2.6.31 on 64-bit UltraSPARC. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-sparc64 +Package: linux-bfs-image-debug-2.6.31-13-sparc64 Architecture: sparc Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on 64-bit UltraSPARC This package provides a kernel debug image for version 2.6.31 on 64-bit UltraSPARC. @@ -606,16 +606,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-sparc64-smp +Package: linux-bfs-image-2.6.31-13-sparc64-smp Architecture: sparc Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules, ivtv-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) Recommends: silo -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on 64-bit UltraSPARC SMP This package contains the Linux kernel image for version 2.6.31 on 64-bit UltraSPARC SMP. @@ -629,27 +629,27 @@ Geared toward desktop or server systems. . You likely do not want to install this package directly. Instead, install - the linux-sparc64-smp meta-package, which will ensure that upgrades work + the linux-bfs-sparc64-smp meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-2.6.31-13-sparc64-smp +Package: linux-bfs-headers-2.6.31-13-sparc64-smp Architecture: sparc Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), linux-headers-2.6.31-13, ${shlibs:Depends} -Provides: linux-headers, linux-headers-2.6 +Depends: coreutils | fileutils (>= 4.0), linux-bfs-headers-2.6.31-13, ${shlibs:Depends} +Provides: linux-bfs-headers, linux-bfs-headers-2.6 Description: Linux kernel headers for version 2.6.31 on 64-bit UltraSPARC SMP This package provides kernel header files for version 2.6.31 on 64-bit UltraSPARC SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-2.6.31-13/debian.README.gz for details. + /usr/share/doc/linux-bfs-headers-2.6.31-13/debian.README.gz for details. -Package: linux-image-debug-2.6.31-13-sparc64-smp +Package: linux-bfs-image-debug-2.6.31-13-sparc64-smp Architecture: sparc Section: devel Priority: optional -Provides: linux-debug +Provides: linux-bfs-debug Description: Linux kernel debug image for version 2.6.31 on 64-bit UltraSPARC SMP This package provides a kernel debug image for version 2.6.31 on 64-bit UltraSPARC SMP. @@ -660,16 +660,16 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-image-2.6.31-13-virtual +Package: linux-bfs-image-2.6.31-13-virtual Architecture: i386 amd64 Section: admin Priority: optional Pre-Depends: dpkg (>= 1.10.24) -Provides: linux-image, linux-image-2.6, fuse-module, redhat-cluster-modules +Provides: linux-bfs-image, linux-bfs-image-2.6, fuse-module, redhat-cluster-modules Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3) -Conflicts: hotplug (<< 0.0.20040105-1), linux-image-2.6.31-13-server +Conflicts: hotplug (<< 0.0.20040105-1), linux-bfs-image-2.6.31-13-server Recommends: grub-pc | grub | lilo (>= 19.1) -Suggests: fdutils, linux-doc-2.6.31 | linux-source-2.6.31 +Suggests: fdutils, linux-bfs-doc-2.6.31 | linux-bfs-source-2.6.31 Description: Linux kernel image for version 2.6.31 on x86/x86_64 This package contains the Linux kernel image for version 2.6.31 on x86/x86_64. @@ -683,5 +683,5 @@ Geared toward virtual machine guests. . You likely do not want to install this package directly. Instead, install - the linux-virtual meta-package, which will ensure that upgrades work + the linux-bfs-virtual meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -r -u linux-13.0/linux-2.6.31/debian.master/control.stub.in linux-13.rename1/linux-2.6.31/debian.master/control.stub.in --- linux-13.0/linux-2.6.31/debian.master/control.stub.in 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/control.stub.in 2009-10-10 12:02:43.000000000 -0400 @@ -1,4 +1,4 @@ -Source: linux +Source: SRCPKGNAME Section: devel Priority: optional Maintainer: Ubuntu Kernel Team @@ -28,7 +28,7 @@ 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 @@ -44,24 +44,24 @@ /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is contained in each file. -Package: linux-headers-PKGVER-ABINUM +Package: SRCPKGNAME-headers-PKGVER-ABINUM Architecture: all Section: devel Priority: optional Depends: coreutils | fileutils (>= 4.0) -Provides: linux-headers, linux-headers-2.6 +Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6 Description: Header files related to Linux kernel version PKGVER This package provides kernel header files for version PKGVER, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details + /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details Package: SRCPKGNAME-libc-dev Architecture: i386 amd64 lpia ia64 powerpc sparc -Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), SRCPKGNAME-kernel-headers -Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), SRCPKGNAME-kernel-headers, libdrm-dev -Provides: SRCPKGNAME-kernel-headers +Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), SRCPKGNAME-kernel-headers, linux-libc-dev +Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), SRCPKGNAME-kernel-headers, libdrm-dev, linux-libc-dev +Provides: SRCPKGNAME-kernel-headers, linux-libc-dev Description: Linux Kernel Headers for development This package provides headers from the Linux kernel. These headers are used by the installed headers for GNU glibc and other system libraries. They are NOT meant to be used to build third-party modules for - your kernel. Use linux-headers-* packages for that. + your kernel. Use SRCPKGNAME-headers-* packages for that. diff -r -u linux-13.0/linux-2.6.31/debian.master/rules.d/0-common-vars.mk linux-13.rename1/linux-2.6.31/debian.master/rules.d/0-common-vars.mk --- linux-13.0/linux-2.6.31/debian.master/rules.d/0-common-vars.mk 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/rules.d/0-common-vars.mk 2009-10-10 12:02:43.000000000 -0400 @@ -84,7 +84,7 @@ # are places that you'll find linux-image hard coded, but I guess thats OK since the # assumption that the binary package always starts with linux-image will never change. # -bin_base_pkg_name=linux-image +bin_base_pkg_name=$(src_pkg_name)-image bin_pkg_name=$(bin_base_pkg_name)-$(abi_release) dbg_pkg_name=$(bin_base_pkg_name)-debug-$(abi_release) hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release) diff -r -u linux-13.0/linux-2.6.31/debian.master/rules.d/2-binary-arch.mk linux-13.rename1/linux-2.6.31/debian.master/rules.d/2-binary-arch.mk --- linux-13.0/linux-2.6.31/debian.master/rules.d/2-binary-arch.mk 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/rules.d/2-binary-arch.mk 2009-10-10 12:02:43.000000000 -0400 @@ -179,14 +179,14 @@ # Remove files which are generated at installation by postinst, except for # modules.order. # - mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order \ - $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order +# mv $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order \ +# $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order rm -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.* - mv $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order \ - $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order +# mv $(pkgdir)/lib/modules/$(abi_release)-$*/_modules.order \ +# $(pkgdir)/lib/modules/$(abi_release)-$*/modules.order headers_tmp := $(CURDIR)/debian/tmp-headers -headers_dir := $(CURDIR)/debian/linux-libc-dev +headers_dir := $(CURDIR)/debian/linux-bfs-libc-dev hmake := $(MAKE) -C $(CURDIR) O=$(headers_tmp) SUBLEVEL=$(SUBLEVEL) \ EXTRAVERSION=-$(abinum) INSTALL_HDR_PATH=$(headers_tmp)/install \ @@ -195,7 +195,7 @@ install-arch-headers: dh_testdir dh_testroot - dh_clean -k -plinux-libc-dev + dh_clean -k -plinux-bfs-libc-dev rm -rf $(headers_tmp) install -d $(headers_tmp) $(headers_dir)/usr/include/ @@ -219,14 +219,14 @@ dh_testdir dh_testroot - dh_installchangelogs -plinux-libc-dev - dh_installdocs -plinux-libc-dev - dh_compress -plinux-libc-dev - dh_fixperms -plinux-libc-dev - dh_installdeb -plinux-libc-dev - dh_gencontrol -plinux-libc-dev - dh_md5sums -plinux-libc-dev - dh_builddeb -plinux-libc-dev + dh_installchangelogs -plinux-bfs-libc-dev + dh_installdocs -plinux-bfs-libc-dev + dh_compress -plinux-bfs-libc-dev + dh_fixperms -plinux-bfs-libc-dev + dh_installdeb -plinux-bfs-libc-dev + dh_gencontrol -plinux-bfs-libc-dev + dh_md5sums -plinux-bfs-libc-dev + dh_builddeb -plinux-bfs-libc-dev binary-%: pkgimg = $(bin_pkg_name)-$* binary-%: pkghdr = $(hdrs_pkg_name)-$* diff -r -u linux-13.0/linux-2.6.31/debian.master/scripts/abi-check linux-13.rename1/linux-2.6.31/debian.master/scripts/abi-check --- linux-13.0/linux-2.6.31/debian.master/scripts/abi-check 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/scripts/abi-check 2009-10-10 12:02:43.000000000 -0400 @@ -10,7 +10,7 @@ my $fail_exit = 1; my $EE = "EE:"; my $errors = 0; -my $abiskip = 0; +my $abiskip = 1; my $count; diff -r -u linux-13.0/linux-2.6.31/debian.master/scripts/misc/getabis linux-13.rename1/linux-2.6.31/debian.master/scripts/misc/getabis --- linux-13.0/linux-2.6.31/debian.master/scripts/misc/getabis 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/scripts/misc/getabis 2009-10-10 12:02:43.000000000 -0400 @@ -37,7 +37,7 @@ continue fi echo -n "Fetching $sub..." - filename=linux-image-${verabi}-${sub}_${verfull}_${arch}.deb + filename=linux-bfs-image-${verabi}-${sub}_${verfull}_${arch}.deb cd $tmpdir for r in $repo $repo_ports $repo_uni $repo_ports_uni do diff -r -u linux-13.0/linux-2.6.31/debian.master/scripts/module-check linux-13.rename1/linux-2.6.31/debian.master/scripts/module-check --- linux-13.0/linux-2.6.31/debian.master/scripts/module-check 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/scripts/module-check 2009-10-10 12:02:43.000000000 -0400 @@ -5,6 +5,8 @@ $abidir = shift; $skipmodule = shift; +$skipmodule = 1; + print "II: Checking modules for $flavour..."; if (-f "$prev_abidir/ignore.modules" diff -r -u linux-13.0/linux-2.6.31/debian.master/scripts/sub-flavour linux-13.rename1/linux-2.6.31/debian.master/scripts/sub-flavour --- linux-13.0/linux-2.6.31/debian.master/scripts/sub-flavour 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/scripts/sub-flavour 2009-10-10 12:02:43.000000000 -0400 @@ -4,8 +4,8 @@ echo "SUB_PROCESS $FROM => $TO" -export from_pkg="linux-image-$ABI_RELEASE-$FROM" -export to_pkg="linux-image-$ABI_RELEASE-$TO" +export from_pkg="linux-bfs-image-$ABI_RELEASE-$FROM" +export to_pkg="linux-bfs-image-$ABI_RELEASE-$TO" from_moddir="debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM" to_moddir="debian/$to_pkg/lib/modules/$ABI_RELEASE-$FROM" diff -r -u linux-13.0/linux-2.6.31/debian.master/sub-flavours/control.stub linux-13.rename1/linux-2.6.31/debian.master/sub-flavours/control.stub --- linux-13.0/linux-2.6.31/debian.master/sub-flavours/control.stub 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/sub-flavours/control.stub 2009-10-10 12:02:43.000000000 -0400 @@ -12,7 +12,7 @@ # # XXX: Leave the blank line before the first package!! -Package: linux-image-PKGVER-ABINUM-FLAVOUR +Package: linux-bfs-image-PKGVER-ABINUM-FLAVOUR Architecture: ARCH Section: admin Priority: optional @@ -21,7 +21,7 @@ Depends: initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3) Conflicts: hotplug (<< 0.0.20040105-1), =CONFLICTS= Recommends: BOOTLOADER -Suggests: fdutils, linux-doc-PKGVER | linux-source-PKGVER +Suggests: fdutils, linux-bfs-doc-PKGVER | linux-bfs-source-PKGVER Description: Linux kernel image for version PKGVER on DESC This package contains the Linux kernel image for version PKGVER on DESC. @@ -35,5 +35,5 @@ 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 linux-bfs-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff -r -u linux-13.0/linux-2.6.31/debian.master/sub-flavours/virtual.vars linux-13.rename1/linux-2.6.31/debian.master/sub-flavours/virtual.vars --- linux-13.0/linux-2.6.31/debian.master/sub-flavours/virtual.vars 2009-10-10 12:01:29.000000000 -0400 +++ linux-13.rename1/linux-2.6.31/debian.master/sub-flavours/virtual.vars 2009-10-10 12:02:43.000000000 -0400 @@ -14,4 +14,4 @@ fi # The provides and conflicts are REQUIRED provides="redhat-cluster-modules" -conflicts="linux-image-PKGVER-ABINUM-${based_on}" +conflicts="linux-bfs-image-PKGVER-ABINUM-${based_on}"