r3716 - in trunk/kernel/source/linux-2.6/debian: . bin templates
Bastian Blank
waldi at costa.debian.org
Sun Aug 7 15:29:33 UTC 2005
Author: waldi
Date: 2005-08-07 15:29:32 +0000 (Sun, 07 Aug 2005)
New Revision: 3716
Added:
trunk/kernel/source/linux-2.6/debian/templates/control.headers.latest.in
trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in
Modified:
trunk/kernel/source/linux-2.6/debian/
trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
trunk/kernel/source/linux-2.6/debian/templates/control.headers.in
trunk/kernel/source/linux-2.6/debian/templates/control.image.in
Log:
r3705: waldi | 2005-08-06 19:58:56 +0000
* debian/bin/gencontrol.py: Use image.latest template.
* debian/templates/control.image.in: Use longclass in long description.
* debian/templates/control.image.latest.in: Add
r3710: waldi | 2005-08-07 09:12:08 +0000
* bin/gencontrol.py
- Rewrap descriptions.
- Support linux-headers latest packages.
* templates/control.image.latest.in: Use major in short description.
* templates/control.headers.latest.in: Add.
r3711: waldi | 2005-08-07 09:35:17 +0000
* bin/gencontrol.py: Hack textwrap to don't split package names.
* templates/control.headers.in: Fix paragraphs.
* templates/control.image.latest.in: Add suggests.
Property changes on: trunk/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
- 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3696
+ 510b9475-24dd-0310-9b6c-e0eefe99d49f:/people/waldi/kernel/source/linux-2.6/debian:3715
Modified: trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-07 15:28:24 UTC (rev 3715)
+++ trunk/kernel/source/linux-2.6/debian/bin/gencontrol.py 2005-08-07 15:29:32 UTC (rev 3716)
@@ -30,6 +30,11 @@
for i in self._list:
yield (i, self[i])
+class wrap(textwrap.TextWrapper):
+ wordsep_re = re.compile(
+ r'(\s+|' # any whitespace
+ r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w))') # em-dash
+
def config():
c = ConfigParser.ConfigParser()
c.read("debian/arch/defines")
@@ -120,7 +125,7 @@
if line[0] in ' \t':
if not last:
raise ValueError('Continuation line seen before first header')
- e[last] += '\n' + line
+ e[last] += '\n' + line.lstrip()
continue
i = line.find(':')
if i < 0:
@@ -191,9 +196,27 @@
value.append(t)
entry[i] = ', '.join(value)
if vars.has_key('desc'):
- entry['Description'] += '\n .\n ' + '\n '.join(textwrap.wrap(vars['desc']))
+ entry['Description'] += "\n.\n" + vars['desc']
+ return process_real_package(entry, vars)
+
+def process_real_package(in_entry, vars):
+ entry = process_entry(in_entry, vars)
+ desc = entry['Description']
+ desc_short, desc_long = desc.split ("\n", 1)
+ desc_pars = desc_long.split ("\n.\n")
+ desc_pars_wrapped = []
+ w = wrap(width = 74, fix_sentence_endings = True)
+ for i in desc_pars:
+ desc_pars_wrapped.append(w.fill(i))
+ entry['Description'] = "%s\n%s" % (desc_short, '\n.\n'.join(desc_pars_wrapped))
return entry
+def process_real_packages(in_entries, vars):
+ entries = []
+ for i in in_entries:
+ entries.append(process_real_package(i, vars))
+ return entries
+
def process_real_tree(in_entry, changelog, vars):
entry = process_entry(in_entry, vars)
tmp = changelog[0]['Source']
@@ -240,7 +263,9 @@
def write_rfc822(f, list):
for i in list:
for j in i.iteritems():
- f.write("%s: %s\n" % j)
+ f.write("%s:" % j[0])
+ for k in j[1].split('\n'):
+ f.write(" %s\n" % k)
f.write('\n')
if __name__ == '__main__':
@@ -270,7 +295,7 @@
packages.append(process_entry(source[0], vars))
main = read_template("main")
- packages.extend(process_entries(main, vars))
+ packages.extend(process_real_packages(main, vars))
tree = read_template("tree")
packages.append(process_real_tree(tree[0], changelog, vars))
@@ -280,10 +305,12 @@
a.sort()
b = vars.copy()
b['arch'] = ' '.join(a)
- packages.extend(process_entries(headers, b))
+ packages.append(process_real_package(headers[0], b))
headers_flavour = read_template("headers.flavour")
+ headers_latest = read_template("headers.latest")
image = read_template("image")
+ image_latest = read_template("image.latest")
i1 = arches.keys()
i1.sort()
@@ -314,8 +341,10 @@
if not flavour_vars.has_key('longclass'):
flavour_vars['longclass'] = flavour_vars['class']
- packages.extend(process_entries(headers_flavour, flavour_vars))
+ packages.append(process_real_package(headers_flavour[0], flavour_vars))
+ packages.append(process_real_package(headers_latest[0], flavour_vars))
packages.append(process_real_image(image[0], flavour_vars))
+ packages.append(process_real_package(image_latest[0], flavour_vars))
write_control(packages)
Modified: trunk/kernel/source/linux-2.6/debian/templates/control.headers.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.headers.in 2005-08-07 15:28:24 UTC (rev 3715)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.headers.in 2005-08-07 15:29:32 UTC (rev 3716)
@@ -11,6 +11,7 @@
the linux-headers- at version@- at abiname@-(flavour) package, matching the
flavour of the kernel you intend the build for. To obtain such a set for the
currently running kernel it is sufficient to run a command
+ .
apt-get install linux-headers- at version@- at abiname@-$(uname -r)
.
and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@-(flavour).
Added: trunk/kernel/source/linux-2.6/debian/templates/control.headers.latest.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.headers.latest.in 2005-08-07 15:28:24 UTC (rev 3715)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.headers.latest.in 2005-08-07 15:29:32 UTC (rev 3716)
@@ -0,0 +1,10 @@
+Package: linux-headers- at subarch@@major at -@flavour@
+Architecture: @arch@
+Section: devel
+Priority: optional
+Depends: linux-headers- at subarch@@version at -@abiname at -@flavour@
+Provides: linux-headers, linux-headers- at major@
+Description: Architecture-specific header files for Linux kernel @major@ on @class@ machines
+ This package depends on the architecture-specific header files for the latest
+ Linux kernel @major@ on @longclass@ machines.
+
Modified: trunk/kernel/source/linux-2.6/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.image.in 2005-08-07 15:28:24 UTC (rev 3715)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.image.in 2005-08-07 15:29:32 UTC (rev 3716)
@@ -8,4 +8,4 @@
Suggests: linux-doc- at version@ | linux-source- at version@
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@ machines.
+ Linux kernel @version@ on @longclass@ machines.
Added: trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in 2005-08-07 15:28:24 UTC (rev 3715)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.image.latest.in 2005-08-07 15:29:32 UTC (rev 3716)
@@ -0,0 +1,9 @@
+Package: linux-image- at subarch@@major at -@flavour@
+Architecture: @arch@
+Section: base
+Priority: optional
+Depends: linux-image- at subarch@@version at -@abiname at -@flavour@
+Suggests: linux-doc- at version@ | linux-source- at version@
+Description: Linux kernel @major@ image on @class@ machines
+ This package depends on the latest binary image for Linux kernel @major@
+ on @longclass@ machines.
More information about the Kernel-svn-changes
mailing list