--- debderiver
+++ debderiver_patch3_1_5.py
@@ -71,10 +71,10 @@
 class Supplementary_Suite(Suite):
     """Supplementary suite.
     
-    This is a suite that can be added to a distribution, i.e. packages from 
-    it complement the principal "distribution" suite.  A supplementary suite 
-    usually provides newer package versions or extra functionality (e.g. a 
-    multimedia suite)."""
+    This is a suite that can be added to a distribution, i.e. packages
+    from it complement the principal "distribution" suite.
+    A supplementary suite usually provides newer package versions or
+    extra functionality (e.g. a multimedia suite)."""
 
     def __init__(self, pocket, distribution):
         Suite.__init__(self)
@@ -103,7 +103,8 @@
 class Reprepro(object):
     """Configure and operate reprepro.
 
-    Write reprepro's configuration files and execute reprepro commands."""
+    Write reprepro's configuration files and execute reprepro
+    commands."""
 
     def __init__(self, op_sys):
         self._DEFAULT_COMPONENT = 'main'
@@ -184,8 +185,8 @@
     def _do(self, command):
         """Execute a reprepro command."""
 
-        # TODO: replace this function with _do2, i.e. use subprocess instead of
-        # os.system.
+        # TODO: replace this function with _do2, i.e. use subprocess
+        # instead of os.system.
 
         os.system(' '.join(('reprepro --noskipold -Vb', self._base_path,
             command)))
@@ -228,10 +229,11 @@
     def _purge_purge_lists(self):
         """Purge packages that are in the purge lists.
 
-        Reprepro only blocks packages that are marked with "purge" in the
-        FilterLists.  To get rid of those packages if they were added to a
-        FilterList later, they need to be removed explicitly. This doesn't
-        delete packages that have the operating system's name in their version."""
+        Reprepro only blocks packages that are marked with "purge" in
+        the FilterLists. To get rid of those packages if they were added
+        to a FilterList later, they need to be removed explicitly. This
+        doesn't delete packages that have the operating system's name in
+        their version."""
 
         for dist in self._op_sys.distributions:
             for src_pkg in dist.purge_list:
@@ -256,8 +258,9 @@
                             path
 
         # Reprepro wants some fields after others (e.g. Codename first). 
-        # Sorting them all is the easiest way to do that. We take scalars 
-        # first, lists second, each alphabetically in so far as reprepro allows.
+        # Sorting them all is the easiest way to do that. We take
+        # scalars first, lists second, each alphabetically in so far as
+        # reprepro allows.
         FIELD_ORDER_DISTS = ('Codename', 'Description', 'FakeComponentPrefix', 
                 'Label', 'Origin', 'SignWith', 'Suite', 'Update', 'Version', 
                 'Architectures', 'Components', 'DebIndices', 'DscIndices', 
@@ -463,9 +466,9 @@
                             'fake_component_prefix']
                 # This is a configuration option instead of an automatic
                 # detection because detection means checking if a
-                # debian-installer directory (or Release file) exists, which
-                # means handling the upstream URI and protocol. That's more
-                # than I want to do now.
+                # debian-installer directory (or Release file) exists,
+                # which means handling the upstream URI and protocol.
+                # That's more than I want to do now.
                 if suites[suite].has_key('exclude_installer'):
                     if suites[suite]['exclude_installer']:
                         s.exclude_installer = True