r3611 - trunk/kernel/source/linux-2.6/debian

[Andres Salomon]

Author: dilinger
Date: 2005-07-21 16:21:45 +0000 (Thu, 21 Jul 2005)
New Revision: 3611

Modified:
   trunk/kernel/source/linux-2.6/debian/Makefile
   trunk/kernel/source/linux-2.6/debian/README
   trunk/kernel/source/linux-2.6/debian/changelog
   trunk/kernel/source/linux-2.6/debian/rules
Log:
add @longclass@ variable


Modified: trunk/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6/debian/Makefile	2005-07-21 16:09:27 UTC (rev 3610)
+++ trunk/kernel/source/linux-2.6/debian/Makefile	2005-07-21 16:21:45 UTC (rev 3611)
@@ -185,8 +185,10 @@
 	cp copyright $(tkdir)/debian
 	substitute() {                                  \
 		class="$$2-class";                            \
+		longclass="";				\
 		desc="";                                \
 		[ -f "debian/arch/$(karch)/$(append)/desc.$$2" ] && . "debian/arch/$(karch)/$(append)/desc.$$2"; \
+		[ -z "$$longclass" ] && longclass="$$class"; \
 		cat templates/control.$$1 |      \
 			sed -e 's/@version@/$(version)/g'       \
 				-e 's/@major@/$(major)/g'           \
@@ -194,6 +196,7 @@
 				-e "s/@subarch@/$(append)/g"             \
 				-e "s/@flavour@/$$2/g"              \
 				-e "s#@class@#$$class#g"            \
+				-e "s#@longclass@#$$longclass#g"    \
 				-e 's/@ltver@/$(ltver)/g'           \
 				-e 's/@srcver@/$(srcver)/g'         \
 				-e 's/@lt_depends@/$(lt_depends)/g' \

Modified: trunk/kernel/source/linux-2.6/debian/README
===================================================================
--- trunk/kernel/source/linux-2.6/debian/README	2005-07-21 16:09:27 UTC (rev 3610)
+++ trunk/kernel/source/linux-2.6/debian/README	2005-07-21 16:21:45 UTC (rev 3611)
@@ -51,9 +51,13 @@
 @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.
- at class@        The CPU/architecture class; displayed in descriptions.  This
-               should be in the form "foo class", and will show up in the
+ at class@        The CPU/architecture class; displayed in synopsis.  It should
+               be fairly short, as the synopsis is supposed to be <80 chars.
+               It should be in the form "foo class", and will show up in the
 	       description as "foo class machines".
+ at longclass@    The CPU/architecture class; displayed in the extended
+               description.  The same rules apply as in @class at .  If
+	       this is unset, it will default to @class at .
 @desc@         (Potentially) multi-line verbiage that's appended to
                -image descriptions.
 @ltver@        linux-tree version, a single digit.

Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog	2005-07-21 16:09:27 UTC (rev 3610)
+++ trunk/kernel/source/linux-2.6/debian/changelog	2005-07-21 16:21:45 UTC (rev 3611)
@@ -1,6 +1,6 @@
 linux-2.6 (2.6.12-2) UNRELEASED; urgency=low
 
-  *
+  * Add @longclass@ variable to control file autogeneration. (Andres Salomon)
 
  -- Andres Salomon <dilinger at debian.org>  Thu, 21 Jul 2005 12:09:30 -0400
  

Modified: trunk/kernel/source/linux-2.6/debian/rules
===================================================================
--- trunk/kernel/source/linux-2.6/debian/rules	2005-07-21 16:09:27 UTC (rev 3610)
+++ trunk/kernel/source/linux-2.6/debian/rules	2005-07-21 16:21:45 UTC (rev 3611)
@@ -260,8 +260,10 @@
 		[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp))-; \
 		all_headers_pkgs=`get_all_headers_pkgs $$2 $$sa`; \
 		class="$$3-class";				\
+		longclass="";				\
 		desc="";				\
 		[ -f "debian/arch/$$2/$$sa/desc.$$3" ] && . "debian/arch/$$2/$$sa/desc.$$3"; \
+		[ -z "$$longclass" ] && longclass="$$class"; \
 		cat debian/templates/control.$$1 |	\
 		sed -e 's/@version@/$(version)/g'	\
 		    -e 's/@major@/$(major)/g'		\
@@ -269,6 +271,7 @@
 		    -e "s/@subarch@/$$sa/g"		\
 		    -e "s/@flavour@/$$3/g"		\
 		    -e "s#@class@#$$class#g"		\
+		    -e "s#@longclass@#$$longclass#g"	\
 		    -e 's/@ltver@/$(ltver)/g'           \
 		    -e 's/@srcver@/$(srcver)/g'		\
 		    -e 's/@lt_depends@/$(lt_depends)/g'	\