r3711 - in people/waldi/kernel/source/linux-2.6/debian: bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-07 09:35:17 +0000 (Sun, 07 Aug 2005)
New Revision: 3711

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
   people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in
Log:
* bin/gencontrol.py: Hack textwrap to don't split package names.
* templates/control.headers.in: Fix paragraphs.
* templates/control.image.latest.in: Add suggests.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-07 09:12:08 UTC (rev 3710)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-07 09:35:17 UTC (rev 3711)
@@ -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")
@@ -200,11 +205,18 @@
     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(textwrap.fill(i, 74))
+        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']
@@ -283,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))
@@ -293,9 +305,10 @@
     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")
 
@@ -328,9 +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.extend(process_entries(image_latest, flavour_vars))
+                packages.append(process_real_package(image_latest[0], flavour_vars))
 
     write_control(packages)
 

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-08-07 09:12:08 UTC (rev 3710)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.in	2005-08-07 09:35:17 UTC (rev 3711)
@@ -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).

Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in	2005-08-07 09:12:08 UTC (rev 3710)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in	2005-08-07 09:35:17 UTC (rev 3711)
@@ -3,6 +3,7 @@
 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.