r3600 - in trunk/kernel/source/linux-2.6-2.6.12/debian: . arch/s390
arch/sparc templates
Andres Salomon
dilinger at costa.debian.org
Wed Jul 20 20:48:51 UTC 2005
Author: dilinger
Date: 2005-07-20 20:48:50 +0000 (Wed, 20 Jul 2005)
New Revision: 3600
Modified:
trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64-smp
trunk/kernel/source/linux-2.6-2.6.12/debian/rules
trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in
trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
Log:
another wording change..
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 20:48:50 UTC (rev 3600)
@@ -184,7 +184,7 @@
cp changelog $(tkdir)/debian
cp copyright $(tkdir)/debian
substitute() { \
- class="$$2"; \
+ class="$$2-class"; \
desc=""; \
[ -f "debian/arch/$(karch)/$(append)/desc.$$2" ] && . "debian/arch/$(karch)/$(append)/desc.$$2"; \
cat templates/control.$$1 | \
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390 2005-07-20 20:48:50 UTC (rev 3600)
@@ -1,2 +1,2 @@
-class="IBM S/390"
+class="IBM S/390-class"
desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/s390/desc.s390x 2005-07-20 20:48:50 UTC (rev 3600)
@@ -1,2 +1,2 @@
-class="IBM zSeries"
+class="IBM zSeries-class"
desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64 2005-07-20 20:48:50 UTC (rev 3600)
@@ -1 +1 @@
-class="uni-processor 64-bit UltraSPARC"
+class="uniprocessor 64-bit UltraSPARC class"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64-smp
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64-smp 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/sparc/desc.sparc64-smp 2005-07-20 20:48:50 UTC (rev 3600)
@@ -1 +1 @@
-class="multi-processor 64-bit UltraSPARC"
+class="multi-processor 64-bit UltraSPARC class"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 20:48:50 UTC (rev 3600)
@@ -259,7 +259,7 @@
sa=""; \
[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp))-; \
all_headers_pkgs=`get_all_headers_pkgs $$2 $$sa`; \
- class="$$3"; \
+ class="$$3-class"; \
desc=""; \
[ -f "debian/arch/$$2/$$sa/desc.$$3" ] && . "debian/arch/$$2/$$sa/desc.$$3"; \
cat debian/templates/control.$$1 | \
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in 2005-07-20 20:48:50 UTC (rev 3600)
@@ -4,9 +4,9 @@
Priority: optional
Depends: coreutils | fileutils (>= 4.0), linux-headers- at subarch@@version at -@abiname@
Provides: linux-headers, linux-headers- at major@
-Description: Architecture-specific header files for Linux kernel @version@ on @class@
+Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
This package provides the architecture-specific kernel header files
- for Linux kernel @version@ on @class at -class machines, generally
+ for Linux kernel @version@ on @class@ machines, generally
used for building out-of-tree kernel modules. These files are going to be
installed into /usr/src/linux-headers- at subarch@@version at -@abiname at -@flavour@, and can
be used for building modules that load into the kernel provided by the
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 20:32:19 UTC (rev 3599)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 20:48:50 UTC (rev 3600)
@@ -7,7 +7,7 @@
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: aboot [alpha], lilo (>= 19.1) | grub [amd64 i386], elilo [ia64], vmelilo [m68k], arcboot (>= 0.3.8) [mips], colo [mipsel], delo [mipsel], s390-tools [s390], silo [sparc], fdutils, linux-doc- at version@ | linux-source- at version@
Recommends: irqbalance [i386]
-Description: Linux kernel @version@ image on @class@
+Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for
- Linux kernel @version@ on @class@ class machines.
+ Linux kernel @version@ on @class@ machines.
@desc@
More information about the Kernel-svn-changes
mailing list