* 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. svn path=/dists/trunk/linux-2.6/; revision=7509
This commit is contained in:
parent
7bf5d09cda
commit
ac2bd196af
|
@ -141,6 +141,9 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
||||||
else:
|
else:
|
||||||
image = image_type_modulesinline
|
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.append(self.process_real_image(image[0], {'depends': image_depends}, config_entry_relations, vars))
|
||||||
packages_own.extend(self.process_packages(image[1:], vars))
|
packages_own.extend(self.process_packages(image[1:], vars))
|
||||||
|
|
||||||
|
@ -223,8 +226,6 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
|
||||||
|
|
||||||
def process_real_image(self, in_entry, relations, config, vars):
|
def process_real_image(self, in_entry, relations, config, vars):
|
||||||
entry = self.process_package(in_entry, 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':
|
for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
|
||||||
value = entry.get(field, package_relation_list())
|
value = entry.get(field, package_relation_list())
|
||||||
t = vars.get(field.lower(), [])
|
t = vars.get(field.lower(), [])
|
||||||
|
|
|
@ -7,6 +7,8 @@ Suggests: linux-doc-@version@
|
||||||
Description: Linux @upstreamversion@ image on @class@
|
Description: Linux @upstreamversion@ image on @class@
|
||||||
This package provides the binary image for
|
This package provides the binary image for
|
||||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||||
|
.
|
||||||
|
@desc@
|
||||||
|
|
||||||
Package: linux-modules-@upstreamversion@@abiname@@localversion@
|
Package: linux-modules-@upstreamversion@@abiname@@localversion@
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|
|
@ -7,3 +7,5 @@ Suggests: linux-doc-@version@
|
||||||
Description: Linux @upstreamversion@ image on @class@
|
Description: Linux @upstreamversion@ image on @class@
|
||||||
This package provides the binary image and pre-built loadable modules for
|
This package provides the binary image and pre-built loadable modules for
|
||||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||||
|
.
|
||||||
|
@desc@
|
||||||
|
|
|
@ -6,3 +6,5 @@ Suggests: linux-doc-@version@
|
||||||
Description: Linux @upstreamversion@ image on @class@
|
Description: Linux @upstreamversion@ image on @class@
|
||||||
This package provides the binary image for
|
This package provides the binary image for
|
||||||
Linux kernel @upstreamversion@ on @longclass@ machines.
|
Linux kernel @upstreamversion@ on @longclass@ machines.
|
||||||
|
.
|
||||||
|
@desc@
|
||||||
|
|
Loading…
Reference in New Issue