debian/lib/python/debian_linux/debian.py,

debian/lib/python/debian_linux/gencontrol.py:
Make it possible to add more than one paragraph as substitution.

svn path=/dists/trunk/linux-2.6/; revision=7060

2 files changed, 9 insertions, 4 deletions

diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index c72ef4df0577..405c14808582 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -85,12 +85,12 @@ class package_description(object):
     __slots__ = "short", "long"
 
     def __init__(self, value = None):
+        self.long = []
         if value is not None:
-            self.short, long = value.split ("\n", 1)
-            self.long = long.split ("\n.\n")
+            self.short, long = value.split("\n", 1)
+            self.append(long)
         else:
             self.short = None
-            self.long = []
 
     def __str__(self):
         ret = self.short + '\n'
@@ -100,6 +100,11 @@ class package_description(object):
             pars.append('\n '.join(w.wrap(i)))
         return self.short + '\n ' + '\n .\n '.join(pars)
 
+    def append(self, str):
+        str = str.strip()
+        if str:
+            self.long.extend(str.split("\n.\n"))
+
 class package_relation(object):
     __slots__ = "name", "version", "arches"
 
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 3f24d1b18bca..6c492202ffe8 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -213,7 +213,7 @@ class gencontrol(object):
         desc = in_desc.__class__()
         desc.short = self.substitute(in_desc.short, vars)
         for i in in_desc.long:
-            desc.long.append(self.substitute(i, vars))
+            desc.append(self.substitute(i, vars))
         e['Description'] = desc
 
     def process_package(self, in_entry, vars):