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

[Bastian Blank]

Author: waldi
Date: 2005-08-07 09:12:08 +0000 (Sun, 07 Aug 2005)
New Revision: 3710

Added:
   people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.latest.in
Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in
Log:
* 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.


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 07:19:02 UTC (rev 3709)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-07 09:12:08 UTC (rev 3710)
@@ -120,7 +120,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,7 +191,18 @@
                 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 = []
+    for i in desc_pars:
+        desc_pars_wrapped.append(textwrap.fill(i, 74))
+    entry['Description'] = "%s\n%s" % (desc_short, '\n.\n'.join(desc_pars_wrapped))
     return entry
 
 def process_real_tree(in_entry, changelog, vars):
@@ -240,7 +251,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__':

Added: people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.latest.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.latest.in	2005-08-07 07:19:02 UTC (rev 3709)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.headers.latest.in	2005-08-07 09:12:08 UTC (rev 3710)
@@ -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: 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 07:19:02 UTC (rev 3709)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.image.latest.in	2005-08-07 09:12:08 UTC (rev 3710)
@@ -3,6 +3,6 @@
 Section: base
 Priority: optional
 Depends: linux-image- at subarch@@version at -@abiname at -@flavour@
-Description: Linux kernel @version@ image on @class@ machines
+Description: Linux kernel @major@ image on @class@ machines
  This package depends on the latest binary image for Linux kernel @major@
  on @longclass@ machines.