[meld/meld-1.6] Allow arbitrary data after bzr diff header lines (closes bgo#682852)

[Kai Willadsen <kaiw src gnome org>]

commit a37af6b72a54c1c93312d933bfe283c75391e494
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Aug 30 08:15:50 2012 +1000

    Allow arbitrary data after bzr diff header lines (closes bgo#682852)
    
    This commit fixes a problem where extra data (exec bit changes) was
    stopping patch validation.

 meld/vc/bzr.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index cd359ed..e68e070 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -33,7 +33,7 @@ class Vc(_vc.CachedVc):
     CMDARGS = ["--no-aliases", "--no-plugins"]
     NAME = "Bazaar-NG"
     VC_DIR = ".bzr"
-    PATCH_INDEX_RE = "^=== modified file '(.*)'$"
+    PATCH_INDEX_RE = "^=== modified file '(.*)'.*$"
 
     # We use None here to indicate flags that we don't deal with or care about
     state_1_map = {