aboutsummaryrefslogtreecommitdiff
path: root/debian.linaro
diff options
context:
space:
mode:
Diffstat (limited to 'debian.linaro')
-rw-r--r--debian.linaro/control.d/flavour-control.stub9
-rw-r--r--debian.linaro/control.stub.in2
-rw-r--r--debian.linaro/copyright9
-rw-r--r--debian.linaro/d-i/package-list2
4 files changed, 13 insertions, 9 deletions
diff --git a/debian.linaro/control.d/flavour-control.stub b/debian.linaro/control.d/flavour-control.stub
index 2a97b120d37..afa99398d86 100644
--- a/debian.linaro/control.d/flavour-control.stub
+++ b/debian.linaro/control.d/flavour-control.stub
@@ -25,9 +25,9 @@ Package: linux-image-PKGVER-ABINUM-FLAVOUR
Architecture: ARCH
Section: admin
Priority: optional
-Pre-Depends: dpkg (>= 1.10.24)
+Pre-Depends: dpkg (>= 1.10.24), debconf | debconf-2.0
#Provides: linux-image, linux-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
+Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda
Conflicts: hotplug (<< 0.0.20040105-1)
Recommends: BOOTLOADER
Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, COMMONSRCPKGNAME-tools
@@ -51,14 +51,15 @@ Package: linux-headers-PKGVER-ABINUM-FLAVOUR
Architecture: ARCH
Section: devel
Priority: optional
-Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
+Depends: ${misc:Depends}, linux-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/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details.
+ /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz
+ for details.
Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
Architecture: ARCH
diff --git a/debian.linaro/control.stub.in b/debian.linaro/control.stub.in
index 47a2caf707f..cc05aac9551 100644
--- a/debian.linaro/control.stub.in
+++ b/debian.linaro/control.stub.in
@@ -12,7 +12,7 @@ Package: linux-headers-PKGVER-ABINUM
Architecture: armel
Section: devel
Priority: optional
-Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0)
+Depends: ${misc:Depends}
#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
diff --git a/debian.linaro/copyright b/debian.linaro/copyright
index d1d04a6d669..00365381765 100644
--- a/debian.linaro/copyright
+++ b/debian.linaro/copyright
@@ -1,6 +1,4 @@
This is the Ubuntu prepackaged version of the Linux kernel.
-Linux was written by Linus Torvalds <Linus.Torvalds@cs.Helsinki.FI>
-and others.
This package was put together by the Ubuntu Kernel Team, from
sources retrieved from upstream linux git.
@@ -10,7 +8,12 @@ ftp://ftp.kernel.org/pub/linux/kernel/
This package is currently maintained by the
Ubuntu Kernel Team <ubuntu-kernel@lists.ubuntu.com>
-Linux is copyrighted by Linus Torvalds and others.
+Copyright:
+
+ Copyright (C) 1991-2011 Linus Torvalds
+ and many others
+
+License:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian.linaro/d-i/package-list b/debian.linaro/d-i/package-list
index 042ce87b758..c7d67cf842b 100644
--- a/debian.linaro/d-i/package-list
+++ b/debian.linaro/d-i/package-list
@@ -74,7 +74,7 @@ Package: nic-shared-modules
Depends: kernel-image, crypto-modules
Priority: standard
Description: nic shared modules
- This package contains modules which support nic modules
+ This package contains modules which support nic modules
Package: parport-modules
Depends: kernel-image