trunk r109: Allow any number of spaces before "urgency" in the header line of a

[James Westby]

------------------------------------------------------------
revno: 109
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Thu 2008-06-12 12:17:47 +0100
message:
  Allow any number of spaces before "urgency" in the header line of a
  changelog, see lvm2's changelog in Ubuntu.
modified:
  debian/changelog
  debian_bundle/changelog.py
  tests/test_strange_changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-06-05 12:46:12 +0000
+++ b/debian/changelog	2008-06-12 11:17:47 +0000
@@ -3,6 +3,8 @@
   [ James Westby ]
   * Allow urgency=HIGH and other words made of capital letters there, see
     fuse's changelog.
+  * Allow any number of spaces before "urgency" in the header line of a
+    changelog, see lvm2's changelog in Ubuntu.
 
   [ John Wright ]
   * debian/control:
@@ -12,7 +14,7 @@
   * debfile.py: add has_key (same implementation of __contains__) to better
     emulate dictionary containers
 
- -- John Wright <jsw at debian.org>  Fri, 30 May 2008 19:16:40 -0600
+ -- John Wright <jsw at debian.org>  Thu, 12 Jun 2008 12:16:53 +0100
 
 python-debian (0.1.10) unstable; urgency=low
 

=== modified file 'debian_bundle/changelog.py'
--- a/debian_bundle/changelog.py	2008-05-16 12:06:03 +0000
+++ b/debian_bundle/changelog.py	2008-06-12 11:17:47 +0000
@@ -181,7 +181,7 @@
     return block
 
 topline = re.compile('^([a-z0-9][-a-z0-9.+]+) \(([-0-9a-zA-Z.:~+]+)\) '
-      +'([-+.0-9a-zA-Z ]+); urgency=([a-zA-Z]+)')
+      +'([-+.0-9a-zA-Z ]+); *urgency=([a-zA-Z]+)')
 blankline = re.compile('^[ \t]*$')
 change = re.compile('^[ ][ ]+.*$')
 endline = re.compile('^ -- (.*)  (\w\w\w, +(\d| \d|\d\d) \w\w\w \d\d\d\d '+

=== modified file 'tests/test_strange_changelog'
--- a/tests/test_strange_changelog	2007-11-29 15:27:12 +0000
+++ b/tests/test_strange_changelog	2008-06-12 11:17:47 +0000
@@ -18,7 +18,7 @@
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 14 Jun 2007 19:54:13 +0100  
 
-python-debian (0.1.1) unstable; urgency=low
+python-debian (0.1.1) unstable;  urgency=low
 
   [ John Wright ]
   * changelog.py: