[Pkg-python-debian-commits] r70 trunk: [merge]

[John Wright]

------------------------------------------------------------
revno: 70
committer: John Wright <john at movingsucks.org>
branch nick: trunk
timestamp: Mon 2007-07-30 11:40:40 -0600
message:
  [merge]
modified:
  debian/changelog
  debian_bundle/changelog.py
    ------------------------------------------------------------
    revno: 69.1.1
    merged: john at movingsucks.org-20070730173941-a8e180c311da722b
    committer: John Wright <john at movingsucks.org>
    branch nick: changelog_distributions
    timestamp: Mon 2007-07-30 11:39:41 -0600
    message:
      * debian_bundle/changelog.py:
        - Accept numbers, '+', and '.' in the distribution field, to match dpkg's
          behavior
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-20 22:29:35 +0000
+++ b/debian/changelog	2007-07-30 17:39:41 +0000
@@ -44,8 +44,11 @@
   * HISTORY.deb822, debian/docs:
     - Install old changelog for deb822 as
       /usr/share/doc/python-debian/HISTORY.deb822
+  * debian_bundle/changelog.py:
+    - Accept numbers, '+', and '.' in the distribution field, to match dpkg's
+      behavior
 
- -- John Wright <john.wright at hp.com>  Fri, 20 Jul 2007 16:27:24 -0600
+ -- John Wright <john.wright at hp.com>  Mon, 30 Jul 2007 11:36:45 -0600
 
 python-debian (0.1.3) unstable; urgency=low
 

=== modified file 'debian_bundle/changelog.py'
--- a/debian_bundle/changelog.py	2007-07-08 18:54:21 +0000
+++ b/debian_bundle/changelog.py	2007-07-30 17:39:41 +0000
@@ -181,7 +181,7 @@
     return block
 
 topline = re.compile('^([a-z0-9][-a-z0-9.+]+) \(([-0-9a-zA-Z.:~+]+)\) '
-      +'([-a-zA-Z ]+); urgency=([a-z]+)')
+      +'([-+.0-9a-zA-Z ]+); urgency=([a-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 '+