Author: waldi
Date: Sun Sep 24 12:00:25 2006
New Revision: 7509
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
Log:
* debian/bin/gencontrol.py
- Don't longer hardcode description addition.
- Support empty description.
* debian/templates/control.image.type-modulesextra.in,
debian/templates/control.image.type-modulesinline.in,
debian/templates/control.image.type-standalone.in:
Explicitely add description.
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Sun Sep 24 12:00:25 2006
@@ -141,6 +141,9 @@
else:
image = image_type_modulesinline
+ if not vars.has_key('desc'):
+ vars['desc'] = None
+
packages_own.append(self.process_real_image(image[0], {'depends':
image_depends}, config_entry_relations, vars))
packages_own.extend(self.process_packages(image[1:], vars))
@@ -223,8 +226,6 @@
def process_real_image(self, in_entry, relations, config, vars):
entry = self.process_package(in_entry, vars)
- if vars.has_key('desc'):
- entry['Description'].long[1:1] = [vars['desc']]
for field in 'Depends', 'Provides', 'Suggests', 'Recommends',
'Conflicts':
value = entry.get(field, package_relation_list())
t = vars.get(field.lower(), [])
Modified:
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
Sun Sep 24 12:00:25 2006
@@ -7,6 +7,8 @@
Description: Linux @upstreamversion@ image on @class@
This package provides the binary image for
Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ @desc@
Package: [EMAIL PROTECTED]@@abiname@@localversion@
Section: admin
Modified:
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
Sun Sep 24 12:00:25 2006
@@ -7,3 +7,5 @@
Description: Linux @upstreamversion@ image on @class@
This package provides the binary image and pre-built loadable modules for
Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ @desc@
Modified:
dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
Sun Sep 24 12:00:25 2006
@@ -6,3 +6,5 @@
Description: Linux @upstreamversion@ image on @class@
This package provides the binary image for
Linux kernel @upstreamversion@ on @longclass@ machines.
+ .
+ @desc@
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
