drop @shortsmpflavour@ and @smpflavour@, and replace with @class@. Also

add @desc@.

svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3596

debian/Makefile

@@ -184,12 +184,17 @@ $(kdir): post-install-$(subarch) $(wildcard templates/control.*.in)
 	cp changelog $(tkdir)/debian
 	cp copyright $(tkdir)/debian
 	substitute() {                                  \
+		class="$$2";                            \
+		desc="";                                \
+		[ -f "debian/arch/$(karch)/$(append)/desc.$$2" ] && . "debian/arch/$(karch)/$(append)/desc.$$2"; \
 		cat templates/control.$$1 |      \
 			sed -e 's/@version@/$(version)/g'       \
 				-e 's/@major@/$(major)/g'           \
 				-e "s/@arch@/$(karch)/g"                 \
 				-e "s/@subarch@/$(append)/g"             \
 				-e "s/@flavour@/$$2/g"              \
+				-e "s/@class@/$$class/g"            \
+				-e "s/@desc@/$$desc/g"              \
 				-e 's/@ltver@/$(ltver)/g'           \
 				-e 's/@srcver@/$(srcver)/g'         \
 				-e 's/@lt_depends@/$(lt_depends)/g' \

debian/README

@@ -51,8 +51,9 @@ common templates for it and substituting the variables:
 @arch@         The Debian arch name, such as powerpc or i386.
 @subarch@      The subarch - only used by powerpc right now.
 @flavour@      The build flavour, such as 686 or k7-smp.
-@smpflavour@   Same as flavour, but turns k7-smp into "multiprocessor k7".
-@shortsmpflavour@   Same as smpflavour, but turns k7-smp into "SMP k7".
+@class@        The CPU/architecture class; displayed in descriptions.
+@desc@         (Potentially) multi-line verbiage that's appended to
+               -image descriptions.
 @ltver@        linux-tree version, a single digit.
 @srcver@       Source version, extracted from the changelog.
                This is normally @version@-@ltver@.

debian/arch/i386/desc.686

@@ -1 +1 @@
-class = PPro/Celeron/PII/PIII/P4
+class="PPro/Celeron/PII/PIII/P4"

debian/arch/i386/desc.686-smp

@@ -1 +1 @@
-class = multi-processor PPro/Celeron/PII/PIII/P4
+class="multi-processor PPro/Celeron/PII/PIII/P4"

debian/arch/i386/desc.k7

@@ -1 +1 @@
-class = AMD Duron/Athlon/AthlonXP 
+class="AMD Duron/Athlon/AthlonXP"

debian/arch/i386/desc.k7-smp

@@ -1 +1 @@
-class = multi-processor AMD Duron/Athlon/AthlonXP 
+class="multi-processor AMD Duron/Athlon/AthlonXP"

debian/rules

@@ -259,22 +259,17 @@ debian/control: $(wildcard debian/templates/control.*.in)
 		sa="";					\
 		[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp))-; \
 		all_headers_pkgs=`get_all_headers_pkgs $$2 $$sa`; \
-		if expr "$$3" : '.*-smp$$' > /dev/null; then \
-			smp="multi"; \
-			shortsmp="SMP"; \
-		else \
-			smp="uni" ;\
-			shortsmp="UP"; \
-		fi; \
-		flavour=`echo $$3| sed 's/-smp//'`; \
+		class="$$3";				\
+		desc="";				\
+		[ -f "debian/arch/$$2/$$sa/desc.$$3" ] && . "debian/arch/$$2/$$sa/desc.$$3"; \
 		cat debian/templates/control.$$1 |	\
 		sed -e 's/@version@/$(version)/g'	\
 		    -e 's/@major@/$(major)/g'		\
 		    -e "s/@arch@/$$2/g"			\
 		    -e "s/@subarch@/$$sa/g"		\
 		    -e "s/@flavour@/$$3/g"		\
-		    -e "s/@smpflavour@/$${smp}processor $${flavour}/g"	\
-		    -e "s/@shortsmpflavour@/$${shortsmp} $${flavour}/g"	\
+		    -e "s/@class@/$$class/g"		\
+		    -e "s/@desc@/$$desc/g"		\
 		    -e 's/@ltver@/$(ltver)/g'           \
 		    -e 's/@srcver@/$(srcver)/g'		\
 		    -e 's/@lt_depends@/$(lt_depends)/g'	\

debian/templates/control.headers.flavour.in

@@ -4,9 +4,9 @@ Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), linux-headers-@subarch@@version@-@abiname@
 Provides: linux-headers, linux-headers-@major@
-Description: Architecture-specific header files for Linux kernel @version@ on @shortsmpflavour@
+Description: Architecture-specific header files for Linux kernel @version@ on @class@
  This package provides the architecture-specific kernel header files
- for Linux kernel @version@ on @smpflavour@-class machines, generally
+ for Linux kernel @version@ on @class@ class machines, generally
  used for building out-of-tree kernel modules.  These files are going to be
  installed into /usr/src/linux-headers-@subarch@@version@-@abiname@-@flavour@, and can
  be used for building modules that load into the kernel provided by the

debian/templates/control.image.in

@@ -7,6 +7,7 @@ Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-t
 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-@version@ | linux-source-@version@
 Recommends: irqbalance [i386]
-Description: Linux kernel @version@ image on @shortsmpflavour@
+Description: Linux kernel @version@ image on @class@
  This package provides the binary image and pre-built loadable modules for
- Linux kernel @version@ on @smpflavour@-class machines.
+ Linux kernel @version@ on @class@ class machines.
+ @desc@