LINARO: Linaro-2.6.35.1000.3

Signed-off-by: John Rigby <john.rigby@linaro.org>

10 files changed, 38 insertions, 742 deletions

diff --git a/Makefile b/Makefile
index 0d18f4a..327a7f9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ all: source
 source: clean
 	ln -s meta-source linux-meta-$(META_VERSION)
 	cd linux-meta-$(META_VERSION); \
-	dpkg-buildpackage -S -sa -rfakeroot -I.git -I.gitignore -i'\.git.*'
+	dpkg-buildpackage -S -sa -rfakeroot -I -i
 
 binary: clean
 	ln -s meta-source linux-meta-$(META_VERSION)
 	cd linux-meta-$(META_VERSION); \
-	debuild -b
+	debuild -b -aarmel
 
 clean:
 	cd meta-source && fakeroot debian/rules clean
diff --git a/meta-source/debian/changelog b/meta-source/debian/changelog
index 88c45dd..2db0274 100644
--- a/meta-source/debian/changelog
+++ b/meta-source/debian/changelog
@@ -1,501 +1,5 @@
-linux-meta (2.6.35.15.16) maverick; urgency=low
+linux-linaro-meta (2.6.35.1000.3) maverick; urgency=low
 
-  * Maverick ABI 15 (2.6.35-15.20)
+  * Linaro Maverick ABI 1000 (2.6.35-1000.3)
 
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Mon, 09 Aug 2010 13:20:00 -0700
-
-linux-meta (2.6.35.14.15) maverick; urgency=low
-
-  * Maverick ABI 14 (2.6.35-14.19)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Sun, 01 Aug 2010 16:53:31 -0700
-
-linux-meta (2.6.35.13.14) maverick; urgency=low
-
-  * Maverick ABI 13
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Fri, 30 Jul 2010 18:01:22 -0700
-
-linux-meta (2.6.35.12.13) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 12 (2.6.35-12.17)
-  * Change RELEASE_NAME from lucid to maverick
-  * Drop nouveau
-  * Enable lbm
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Wed, 28 Jul 2010 08:03:04 -0700
-
-linux-meta (2.6.35.11.12) maverick; urgency=low
-
-  * Maverick ABI 11 (2.6.35-11.16)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Fri, 23 Jul 2010 10:44:33 +0200
-
-linux-meta (2.6.35.10.11) maverick; urgency=low
-
-  * Maverick ABI 10 (2.6.35-10.15)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Thu, 22 Jul 2010 12:48:18 +0200
-
-linux-meta (2.6.35.9.10) maverick; urgency=low
-
-  * Maverick ABI 9 (2.6.35-9.14)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Fri, 16 Jul 2010 17:56:19 -0700
-
-linux-meta (2.6.35.8.9) maverick; urgency=low
-
-  * Maverick ABI 8 (2.6.35-8.13)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Tue, 13 Jul 2010 19:42:38 -0700
-
-linux-meta (2.6.35.7.8) maverick; urgency=low
-
-  * Maverick ABI 7 (2.6.35-7.10)
-
- -- Tim Gardner <tim.gardner@canonical.com>  Wed, 07 Jul 2010 11:42:16 -0600
-
-linux-meta (2.6.35.6.7) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 6 (2.6.35-6.7)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Thu, 24 Jun 2010 15:45:17 -0700
-
-linux-meta (2.6.35.5.6) maverick; urgency=low
-
-  * Add meta-packages for ARM omap which is now in the main package.
-    - LP: #595949
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 23 Jun 2010 10:03:02 +0100
-
-linux-meta (2.6.35.5.5) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 5 (2.6.35-5.6)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Mon, 21 Jun 2010 13:38:44 -0700
-
-linux-meta (2.6.35.4.4) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 4 (2.6.35-4.5)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Wed, 16 Jun 2010 10:37:09 -0700
-
-linux-meta (2.6.35.3.3) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 3 (2.6.35-3.4)
-  * Drop preempt
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Mon, 14 Jun 2010 10:40:24 -0700
-
-linux-meta (2.6.35.2.2) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 2 (2.6.35-2.2)
-  * Update linux-headers-virtual depends clause 
-
-  [ Loïc Minier ]
-
-  * Enable linux-tools on armel
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Tue, 08 Jun 2010 17:19:53 -0700
-
-linux-meta (2.6.35.1.1) maverick; urgency=low
-
-  * Maverick ABI 1 (2.6.35-1.1)
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Fri, 04 Jun 2010 22:30:44 -0700
-
-linux-meta (2.6.34.5.4) maverick; urgency=low
-
-  * Maverick ABI 5
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Fri, 28 May 2010 10:24:39 -0700
-
-linux-meta (2.6.34.4.3) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 4
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Tue, 25 May 2010 11:02:43 -0700
-
-linux-meta (2.6.34.3.2) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Maverick ABI 3
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Wed, 19 May 2010 08:46:03 -0700
-
-linux-meta (2.6.34.2.1) maverick; urgency=low
-
-  [ Leann Ogasawara ]
-
-  * Initial Maverick ABI
-  * Drop 386 flavour
-  * Disable lbm
-  * Drop lpia
-
- -- Leann Ogasawara <leann.ogasawara@canonical.com>  Thu, 13 May 2010 13:37:43 +0200
-
-linux-meta (2.6.32.22.23) lucid-proposed; urgency=low
-
-  * Lucid ABI 22
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 28 Apr 2010 16:43:27 +0100
-
-linux-meta (2.6.32.21.22) lucid; urgency=low
-
-  * Lucid ABI 21
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 14 Apr 2010 09:29:56 +0100
-
-linux-meta (2.6.32.20.21) lucid; urgency=low
-
-  * Add linux-tools meta package
-    - LP: #559027
-  * Lucid ABI 20
-
- -- Andy Whitcroft <apw@canonical.com>  Fri, 09 Apr 2010 09:26:42 +0100
-
-linux-meta (2.6.32.19.20) lucid; urgency=low
-
-  * Lucid ABI 19
-
- -- Andy Whitcroft <apw@canonical.com>  Thu, 01 Apr 2010 12:01:32 +0100
-
-linux-meta (2.6.32.18.19) lucid; urgency=low
-
-  * Lucid ABI 18
-
- -- Stefan Bader <stefan.bader@canonical.com>  Fri, 26 Mar 2010 19:20:34 +0100
-
-linux-meta (2.6.32.17.18) lucid; urgency=low
-
-  * Lucid ABI 17
-
- -- Stefan Bader <stefan.bader@canonical.com>  Tue, 23 Mar 2010 15:34:50 +0100
-
-linux-meta (2.6.32.16.17) lucid; urgency=low
-
-  * add backport modules support for preempt flavour
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 08 Mar 2010 19:37:42 +0000
-
-linux-meta (2.6.32.16.16) lucid; urgency=low
-
-  * drop the nouveau meta packages
-  * Lucid ABI 16
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 08 Mar 2010 09:16:23 +0000
-
-linux-meta (2.6.32.15.16) lucid; urgency=low
-
-  * Lucid ABI 15
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 02 Mar 2010 11:07:13 +0000
-
-linux-meta (2.6.32.14.15) lucid; urgency=low
-
-  * Reinstate transitional packages for i386 moving upgraders from -server
-    to -generic-pae.
-      - LP: 399718
-  * Lucid ABI 14
-  * Correct linkage between wireless packages
-  * Fix typo in i386 nouveau meta package name
-
- -- Andy Whitcroft <apw@canonical.com>  Fri, 19 Feb 2010 19:13:24 +0000
-
-linux-meta (2.6.32.13.14) lucid; urgency=low
-
-  * add low-latency preempt flavour
-  * add versatile arm flavour
-  * reinstate the LBM meta packages
-  * we are not using anything clever, move to debhelper version 5
-  * lintian -- clean up misc-depends warnings
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 16 Feb 2010 13:57:48 +0000
-
-linux-meta (2.6.32.13.13) lucid; urgency=low
-
-  * Lucid ABI 13
-
- -- Andy Whitcroft <apw@canonical.com>  Thu, 11 Feb 2010 08:51:25 +0000
-
-linux-meta (2.6.32.12.12) lucid; urgency=low
-
-  * Lucid ABI 12
-
- -- Andy Whitcroft <apw@canonical.com>  Fri, 29 Jan 2010 01:10:17 +0000
-
-linux-meta (2.6.32.11.11) lucid; urgency=low
-
-  * Lucid ABI 11
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 20 Jan 2010 09:21:00 +0000
-
-linux-meta (2.6.32.10.10) lucid; urgency=low
-
-  * Lucid ABI 10
-
- -- Andy Whitcroft <apw@canonical.com>  Sun, 10 Jan 2010 23:46:54 +0000
-
-linux-meta (2.6.32.9.9) lucid; urgency=low
-
-  * Lucid ABI 9
-
- -- Andy Whitcroft <apw@canonical.com>  Sat, 19 Dec 2009 21:39:57 +0000
-
-linux-meta (2.6.32.8.8) lucid; urgency=low
-
-  * Lucid ABI 8
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 14 Dec 2009 12:18:00 +0000
-
-linux-meta (2.6.32.7.7) lucid; urgency=low
-
-  * Lucid ABI 7
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 07 Dec 2009 08:38:03 +0000
-
-linux-meta (2.6.32.6.6) lucid; urgency=low
-
-  * Lucid ABI 6
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 01 Dec 2009 19:52:55 +0000
-
-linux-meta (2.6.32.5.5) lucid; urgency=low
-
-  * Lucid ABI 5
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 24 Nov 2009 11:45:32 +0000
-
-linux-meta (2.6.32.4.4) lucid; urgency=low
-
-  * Lucid ABI 4
-
- -- Andy Whitcroft <apw@canonical.com>  Fri, 13 Nov 2009 20:09:44 +0000
-
-linux-meta (2.6.32.3.3) lucid; urgency=low
-
-  * Lucid ABI 3
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 04 Nov 2009 13:04:07 +0000
-
-linux-meta (2.6.32.2.2) lucid; urgency=low
-
-  * Disable the linux-backports-modules-* until such time as LBM is needed.
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 04 Nov 2009 13:04:07 +0000
-
-linux-meta (2.6.32.2.1) lucid; urgency=low
-
-  * Lucid ABI 2
-  * Drop the transitional packages for karmic -server to -generic-pae
-    upgraders for lucid.
-  * Switch series to lucid.
-  * Drop the linux-backports-modules package, we should only use sub-system
-    specific modules for lucid.
-
- -- Andy Whitcroft <apw@canonical.com>  Sat, 31 Oct 2009 01:43:00 +0000
-
-linux-meta (2.6.31.14.27) karmic; urgency=low
-
-  * Added transitional packages for i386 moving upgraders from -server
-    to -generic-pae.
-      - LP: #399718
-
- -- Andy Whitcroft <apw@canonical.com>  Thu, 15 Oct 2009 09:28:52 +0100
-
-linux-meta (2.6.31.14.26) karmic; urgency=low
-
-  * Added linux-backports-modules-headers-karmic meta packages
-  * Removed linux-backports-modules-karmic-*-virtual
-    LBM does not generate a virtual flavour.
-  * Added linux-backports-modules-wireless-karmic meta package.
-    The orignal meta package linux-backports-modules-karmic* points
-    to the same package. Need to drop this non-orthogonality in Lucid.
-  * Added linux-backports-modules-alsa-karmic meta package
-
- -- Tim Gardner <tim.gardner@canonical.com>  Wed, 14 Oct 2009 13:09:22 -0600
-
-linux-meta (2.6.31.14.25) karmic; urgency=low
-
-  * Karmic ABI 14
-
- -- Tim Gardner <tim.gardner@canonical.com>  Tue, 13 Oct 2009 16:44:48 -0600
-
-linux-meta (2.6.31.13.24) karmic; urgency=low
-
-  * Karmic ABI 13
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 09 Oct 2009 06:02:03 -0600
-
-linux-meta (2.6.31.12.23) karmic; urgency=low
-
-  * Karmic ABI 12
-
- -- Tim Gardner <tim.gardner@canonical.com>  Tue, 06 Oct 2009 06:50:19 -0600
-
-linux-meta (2.6.31.11.22) karmic; urgency=low
-
-  * Karmic ABI 11
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 25 Sep 2009 10:35:13 -0600
-
-linux-meta (2.6.31.10.21) karmic; urgency=low
-
-  * Karmic ABI 10
-  * fix grub2 dependancy to point to grub-pc
-    - LP: #425822
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 07 Sep 2009 16:38:51 +0100
-
-linux-meta (2.6.31.9.20) karmic; urgency=low
-
-  * Karmic ABI 9
-
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 31 Aug 2009 17:51:24 -0600
-
-linux-meta (2.6.31.8.19) karmic; urgency=low
-
-  * Karmic ABI 8
-
- -- Tim Gardner <tim.gardner@canonical.com>  Thu, 27 Aug 2009 14:05:46 -0600
-
-linux-meta (2.6.31.7.18) karmic; urgency=low
-
-  * Karmic ABI 7
-
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 24 Aug 2009 20:06:16 -0600
-
-linux-meta (2.6.31.6.17) karmic; urgency=low
-
-  * Karmic ABI 6
-  * Removed armel/imx51
-
- -- Tim Gardner <tim.gardner@canonical.com>  Sun, 16 Aug 2009 20:44:54 -0600
-
-linux-meta (2.6.31.5.16) karmic; urgency=low
-
-  * Karmic ABI 5
-
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 03 Aug 2009 10:44:53 -0600
-
-linux-meta (2.6.31.4.15) karmic; urgency=low
-
-  [ Andy Whitcroft ]
-
-  * fix dependancies for i386 virtual kernel
-    - LP: #399914
-  * Karmic ABI 4
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 21 Jul 2009 11:47:11 +0100
-
-linux-meta (2.6.31.3.14) karmic; urgency=low
-
-  * Karmic ABI 3
-
- -- Tim Gardner <tim.gardner@canonical.com>  Tue, 14 Jul 2009 08:07:05 -0600
-
-linux-meta (2.6.31.2.13) karmic; urgency=low
-
-  * Add grub2 as a linux-crashdump dependency
-    -LP: #391026
-
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 06 Jul 2009 11:28:50 -0600
-
-linux-meta (2.6.31.2.12) karmic; urgency=low
-
-  * Karmic ABI 2
-
- -- Andy Whitcroft <apw@canonical.com>  Sun, 05 Jul 2009 12:16:48 +0100
-
-linux-meta (2.6.31.1.11) karmic; urgency=low
-
-  [ Andy Whitcroft ]
-
-  * Rebuild debian/control to contain updated recommends etc
-  * Karmic ABI 1 (2.6.31)
-
-  [ Tim Gardner ]
-
-  * Recommend apport for linux-crashdump
-    - LP: #391026
-
- -- Andy Whitcroft <apw@canonical.com>  Mon, 29 Jun 2009 15:56:38 +0100
-
-linux-meta (2.6.30.10.10) karmic; urgency=low
-
-  * Karmic ABI 10
-
- -- Tim Gardner <tim.gardner@canonical.com>  Tue, 23 Jun 2009 06:34:11 -0600
-
-linux-meta (2.6.30.9.9) karmic; urgency=low
-
-  [Matt Zimmerman]
-
-  * Remove linux-doc in preparation for non-ABI dependent package name.
-    -LP: #382115
-
- -- Tim Gardner <tim.gardner@canonical.com>  Mon, 22 Jun 2009 08:46:53 -0600
-
-linux-meta (2.6.30.9.8) karmic; urgency=low
-
-  * Karmic ABI 9
-
- -- Andy Whitcroft <apw@canonical.com>  Wed, 10 Jun 2009 14:10:35 +0100
-
-linux-meta (2.6.30.8.7) karmic; urgency=low
-
-  * Karmic ABI 8
-
- -- Andy Whitcroft <apw@canonical.com>  Thu, 04 Jun 2009 11:27:29 +0100
-
-linux-meta (2.6.30.7.6) karmic; urgency=low
-
-  * Karmic ABI 7
-
- -- Andy Whitcroft <apw@canonical.com>  Tue, 26 May 2009 09:26:01 +0100
-
-linux-meta (2.6.30.6.5) karmic; urgency=low
-
-  * Karmic ABI 6
-
- -- Andy Whitcroft <apw@canonical.com>  Sat, 23 May 2009 23:24:09 +0100
-
-linux-meta (2.6.30.5.4) karmic; urgency=low
-
-  * Replaced RELEASE_NAME in the rules file with karmic as well and rebuild
-    the control file.
-
- -- Stefan Bader <stefan.bader@canonical.com>  Tue, 12 May 2009 16:02:37 +0200
-
-linux-meta (2.6.30.5.3) karmic; urgency=low
-
-  * Updated vcs-git line to reference karmic.
-
- -- Stefan Bader <stefan.bader@canonical.com>  Tue, 12 May 2009 14:46:54 +0200
-
-linux-meta (2.6.30.5.2) karmic; urgency=low
-
-  * Karmic ABI 5
-
- -- Stefan Bader <stefan.bader@canonical.com>  Tue, 12 May 2009 11:42:24 +0200
-
-linux-meta (2.6.30.2.1) karmic; urgency=low
-
-  * Karmic ABI 2
-
- -- Tim Gardner <tim.gardner@canonical.com>  Fri, 01 May 2009 18:17:31 +0100
+ -- John Rigby <john.rigby@linaro.org>  Wed, 11 Aug 2010 20:11:04 -0600
diff --git a/meta-source/debian/control.common b/meta-source/debian/control.common
index ffc2053..22dc513 100644
--- a/meta-source/debian/control.common
+++ b/meta-source/debian/control.common
@@ -1,4 +1,4 @@
-Source: linux-meta
+Source: linux-linaro-meta
 Section: devel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
@@ -6,15 +6,6 @@ Standards-Version: 3.6.1
 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 5), gawk
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-karmic-meta.git
 
-Package: linux
-Architecture: i386 amd64 lpia
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image (= ${binary:Version})
-Description: Generic complete Linux kernel.
- This package will always depend on the latest generic complete Linux kernel
- available.
-
 Package: linux-source
 Architecture: all
 Section: devel
@@ -23,35 +14,3 @@ Depends: ${misc:Depends}, linux-source-${kernel-version}
 Description: Linux kernel source with Ubuntu patches
  This package will always depend on the latest Linux kernel source code
  available. The Ubuntu patches have been applied.
-
-Package: linux-image
-Architecture: i386 amd64 lpia
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${generic-depends} (= ${binary:Version})
-Description: Generic Linux kernel image.
- This package will always depend on the latest generic Linux kernel image
- available.
-
-Package: linux-crashdump
-Architecture: i386 amd64
-Section: devel
-Depends: ${misc:Depends}, kexec-tools, makedumpfile, grub-pc (>= 1.96+20090611-1ubuntu2) | grub (>= 0.97-29ubuntu24)
-Recommends: apport
-Suggests: crash
-Description: Linux kernel crashdump setup for the latest generic kernel
- This package installs all the needed infrstracture to get crashdumps from
- your running system. If you are experiencing kernel crashes that cannot
- be debugged normally (because the problem is infrequent or panic's the
- system in such a way as to make information gathering impossible), then
- you can install this package to automatically enable capture of the
- vmcore on crashes.
-
-Package: linux-tools
-Architecture: i386 amd64 armel
-Section: metapackages
-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 
- available. The Ubuntu patches have been applied.
-
diff --git a/meta-source/debian/control.d/generic b/meta-source/debian/control.d/generic
deleted file mode 100644
index 3fce07b..0000000
--- a/meta-source/debian/control.d/generic
+++ /dev/null
@@ -1,47 +0,0 @@
-Package: linux-headers-generic
-Architecture: i386 amd64
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic
-Description: Generic Linux kernel headers
- This package will always depend on the latest generic kernel headers
- available.
-
-Package: linux-image-generic
-Architecture: i386 amd64
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic, linux-firmware
-Description: Generic Linux kernel image
- This package will always depend on the latest generic kernel image
- available.
-
-Package: linux-generic
-Architecture: i386 amd64
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-generic (= ${binary:Version})
-Description: Complete Generic Linux kernel
- This package will always depend on the latest complete generic Linux kernel
- available.
-
-Package: linux-backports-modules-headers-RELEASE_NAME-generic
-Architecture: amd64 i386
-Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic
-Description: Backported driver headers for generic kernel image
- This empty package allows people to keep their backported module
- headers up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-wireless-RELEASE_NAME-generic
-Architecture: amd64 i386
-Depends: ${misc:Depends}, linux-backports-modules-wireless-${kernel-abi-version}-generic
-Description: Backported wireless drivers for generic kernel image
- This empty package allows people to keep their backported wireless modules
- up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-alsa-RELEASE_NAME-generic
-Architecture: amd64 i386
-Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic
-Description: Backported drivers for alsa-driver snapshot.
- This empty package allows people to keep their alsa-driver snapshot
- up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/generic-pae b/meta-source/debian/control.d/generic-pae
deleted file mode 100644
index b7a48d1..0000000
--- a/meta-source/debian/control.d/generic-pae
+++ /dev/null
@@ -1,47 +0,0 @@
-Package: linux-headers-generic-pae
-Architecture: i386
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-generic-pae
-Description: Generic Linux kernel headers
- This package will always depend on the latest generic kernel headers
- available.
-
-Package: linux-image-generic-pae
-Architecture: i386
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-generic-pae, linux-firmware
-Description: Generic Linux kernel image
- This package will always depend on the latest generic kernel image
- available.
-
-Package: linux-generic-pae
-Architecture: i386
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-generic-pae (= ${binary:Version})
-Description: Complete Generic Linux kernel
- This package will always depend on the latest complete generic Linux kernel
- available.
-
-Package: linux-backports-modules-headers-RELEASE_NAME-generic-pae
-Architecture: i386
-Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-generic-pae
-Description: Backported driver headers for generic-pae kernel image
- This empty package allows people to keep their backported module
- headers up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-wireless-RELEASE_NAME-generic-pae
-Architecture: i386
-Depends: ${misc:Depends}, linux-backports-modules-wireless-${kernel-abi-version}-generic-pae
-Description: Backported wireless drivers for generic kernel image
- This empty package allows people to keep their backported wireless modules
- up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-alsa-RELEASE_NAME-generic-pae
-Architecture: i386
-Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-generic-pae
-Description: Backported drivers for alsa-driver snapshot.
- This empty package allows people to keep their alsa-driver snapshot
- up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/omap b/meta-source/debian/control.d/omap
index 4e11675..1d8077e 100644
--- a/meta-source/debian/control.d/omap
+++ b/meta-source/debian/control.d/omap
@@ -1,26 +1,26 @@
-Package: linux-headers-omap
+Package: linux-linaro-headers-omap
 Architecture: armel
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-omap 
-Description: Linux kernel headers for the Versatile architecture.
+Description: Linux kernel headers for the OMAP architecture.
  This package will always depend on the latest kernel headers available
  for ARM TI OMAP3 systems.
 
-Package: linux-image-omap
+Package: linux-linaro-image-omap
 Architecture: armel
 Section: metapackages
 Priority: optional
 Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-omap, linux-firmware
-Description: Linux kernel image for the Versatile architecture.
+Description: Linux kernel image for the OMAP architecture.
  This package will always depend on the latest kernel image available
  for ARM TI OMAP3 systems.
 
-Package: linux-omap
+Package: linux-linaro-omap
 Architecture: armel
 Section: metapackages
 Priority: optional
 Depends: ${misc:Depends}, linux-image-omap (= ${binary:Version})
-Description: Complete Linux kernel for the Versatile architecture.
+Description: Complete Linux kernel for the OMAP architecture.
  This package will always depend on the latest complete Linux kernel available
  for ARM TI OMAP3 systems.
diff --git a/meta-source/debian/control.d/server b/meta-source/debian/control.d/server
deleted file mode 100644
index b8e6990..0000000
--- a/meta-source/debian/control.d/server
+++ /dev/null
@@ -1,47 +0,0 @@
-Package: linux-headers-server
-Architecture: amd64 i386
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-server [amd64], linux-headers-generic-pae [i386]
-Description: Linux kernel headers on Server Equipment.
- This package will always depend on the latest kernel headers available
- for Server Equipment.
-
-Package: linux-image-server
-Architecture: amd64 i386
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-server [amd64], linux-firmware [amd64], linux-image-generic-pae [i386]
-Description: Linux kernel image on Server Equipment.
- This package will always depend on the latest kernel image available
- for Server Equipment.
-
-Package: linux-server
-Architecture: amd64 i386
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-server (= ${binary:Version}) [amd64], linux-generic-pae [i386]
-Description: Complete Linux kernel on Server Equipment.
- This package will always depend on the latest complete Linux kernel available
- for Server Equipment.
-
-Package: linux-backports-modules-headers-RELEASE_NAME-server
-Architecture: amd64
-Depends: ${misc:Depends}, linux-headers-lbm-${kernel-abi-version}-server
-Description: Backported driver headers for server kernel image
- This empty package allows people to keep their backported module
- headers up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-wireless-RELEASE_NAME-server
-Architecture: amd64
-Depends: ${misc:Depends}, linux-backports-modules-wireless-${kernel-abi-version}-server
-Description: Backported wireless drivers for server kernel image
- This empty package allows people to keep their backported wireless modules
- up-to-date when upgrading their Linux kernel.
-
-Package: linux-backports-modules-alsa-RELEASE_NAME-server
-Architecture: amd64
-Depends: ${misc:Depends}, linux-backports-modules-alsa-${kernel-abi-version}-server
-Description: Backported drivers for alsa-driver snapshot.
- This empty package allows people to keep their alsa-driver snapshot
- up-to-date when upgrading their Linux kernel.
diff --git a/meta-source/debian/control.d/versatile b/meta-source/debian/control.d/versatile
deleted file mode 100644
index ff11b18..0000000
--- a/meta-source/debian/control.d/versatile
+++ /dev/null
@@ -1,26 +0,0 @@
-Package: linux-headers-versatile
-Architecture: armel
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-versatile 
-Description: Linux kernel headers for the Versatile architecture.
- This package will always depend on the latest kernel headers available
- for ARM versatile systems.
-
-Package: linux-image-versatile
-Architecture: armel
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-versatile, linux-firmware
-Description: Linux kernel image for the Versatile architecture.
- This package will always depend on the latest kernel image available
- for ARM versatile systems.
-
-Package: linux-versatile
-Architecture: armel
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-versatile (= ${binary:Version})
-Description: Complete Linux kernel for the Versatile architecture.
- This package will always depend on the latest complete Linux kernel available
- for ARM versatile systems.
diff --git a/meta-source/debian/control.d/vexpress b/meta-source/debian/control.d/vexpress
new file mode 100644
index 0000000..5f9c856
--- /dev/null
+++ b/meta-source/debian/control.d/vexpress
@@ -0,0 +1,26 @@
+Package: linux-linaro-headers-vexpress
+Architecture: armel
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-vexpress 
+Description: Linux kernel headers for the ARM Versatile Express architecture.
+ This package will always depend on the latest kernel headers available
+ for ARM Versatile Express systems.
+
+Package: linux-linaro-image-vexpress
+Architecture: armel
+Section: metapackages
+Priority: optional
+Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-vexpress, linux-firmware
+Description: Linux kernel image for the Versatile Express architecture.
+ This package will always depend on the latest kernel image available
+ for ARM Versatile Express systems.
+
+Package: linux-linaro-vexpress
+Architecture: armel
+Section: metapackages
+Priority: optional
+Depends: ${misc:Depends}, linux-image-vexpress (= ${binary:Version})
+Description: Complete Linux kernel for the Versatile Express architecture.
+ This package will always depend on the latest complete Linux kernel available
+ for ARM Versatile Express systems.
diff --git a/meta-source/debian/control.d/virtual b/meta-source/debian/control.d/virtual
deleted file mode 100644
index 210ecfe..0000000
--- a/meta-source/debian/control.d/virtual
+++ /dev/null
@@ -1,26 +0,0 @@
-Package: linux-headers-virtual
-Architecture: i386 amd64
-Section: devel
-Priority: optional
-Depends: ${misc:Depends}, linux-headers-${kernel-abi-version}-virtual
-Description: Linux kernel headers for virtual machines
- This package will always depend on the latest kernel headers available
- for virtual machines.
-
-Package: linux-image-virtual
-Architecture: i386 amd64
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-virtual, linux-firmware
-Description: Linux kernel image for virtual machines
- This package will always depend on the latest kernel image available
- for virtual machines.
-
-Package: linux-virtual
-Architecture: i386 amd64
-Section: metapackages
-Priority: optional
-Depends: ${misc:Depends}, linux-image-virtual (= ${binary:Version})
-Description: Complete Linux kernel for virtual machines
- This package will always depend on the latest complete Linux kernel available
- for virtual machines.