From: Mike O'Connor <stew@vireo.org>
Date: Fri, 30 Oct 2009 09:03:24 +0000 (+0100)
Subject: merge from master
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=778f521cd0cbd2093896c2476738377dc58e41b7;p=dak.git

merge from master

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

778f521cd0cbd2093896c2476738377dc58e41b7
diff --cc daklib/utils.py
index ec1cd366,a6660ae1..21446fbe
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@@ -45,9 -45,9 +45,10 @@@ from dak_exceptions import 
  from textutils import fix_maintainer
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                      re_multi_line_field, re_srchasver, re_taint_free, \
 -                    re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource
 +                    re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource, \
 +                    re_is_orig_source
  
+ from formats import parse_format, validate_changes_format
  from srcformats import get_format_from_string
  from collections import defaultdict