Package: meld
Version: 1.1.5.1-2
Followup-For: Bug #428843

Here's a patch I sent upstream to correct the problem on version
1.2.1.

Debian's meld version is very old, and should probably be updated.

Thanks in advance.

leda$ diff -u vc/mercurial.py.org vc/mercurial.py
--- vc/mercurial.py.org 2008-12-17 16:56:11.000000000 +0100
+++ vc/mercurial.py     2008-12-17 16:56:24.000000000 +0100
@@ -30,7 +30,7 @@
     CMD = "hg"
     NAME = "Mercurial"
     PATCH_STRIP_NUM = 1
-    PATCH_INDEX_RE = "^diff -r \w+ (.*)$"
+    PATCH_INDEX_RE = "^diff --git a/(.*) b/.*$"
 
     def __init__(self, location):
         while location != "/":




-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash

Versions of packages meld depends on:
ii  python                        2.5.2-3    An interactive high-level object-o
ii  python-glade2                 2.12.1-6   GTK+ bindings: Glade support
ii  python-gnome2                 2.22.0-1   Python bindings for the GNOME desk
ii  python-gtk2                   2.12.1-6   Python bindings for the GTK+ widge
ii  python-support                0.8.4      automated rebuilding support for P

Versions of packages meld recommends:
ii  python-gnome2-desktop        2.22.0-2    Python bindings for the GNOME desk
ii  yelp                         2.22.1-8+b1 Help browser for GNOME 2

meld suggests no packages.

-- no debconf information




-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to