Package: meld
Version: 1.1.5-1
Severity: normal
Tags: patch
Meld does not recognize RCS metadata as such; i.e. it will not be
ignored when recursively diffing (melding) over directories. I
believe the attached patch corrects this.
(It definitely works for RCS/ dirs, but I haven't tested whether it
works when foo and foo,v are in the same directory, which is a less
common but still valid style.)
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.21-2-amd64 (SMP w/1 CPU core)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages meld depends on:
ii python 2.4.4-6 An interactive high-level object-o
ii python-glade2 2.10.6-1 GTK+ bindings: Glade support
ii python-gnome2 2.18.2-1 Python bindings for the GNOME desk
ii python-gtk2 2.10.6-1 Python bindings for the GTK+ widge
ii python-support 0.6.4 automated rebuilding support for p
Versions of packages meld recommends:
ii python-gnome2-extras 2.14.3-1 Python bindings for the GNOME desk
-- no debconf information
--- meldapp.py.~1~ 2007-06-10 04:38:07.000000000 +1000
+++ meldapp.py 2007-07-13 18:19:55.637444600 +1000
@@ -442,7 +442,7 @@
#TRANSLATORS: translate this string ONLY to the first "\t", leave
it and the following parts intact
_("Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n") + \
#TRANSLATORS: translate this string ONLY to the first "\t", leave
it and the following parts intact
- _("Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids
.arch-inventory\n") + \
+ _("Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids
.arch-inventory RCS *,v\n") + \
#TRANSLATORS: translate this string ONLY to the first "\t", leave
it and the following parts intact
_("Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n") + \
#TRANSLATORS: translate this string ONLY to the first "\t", leave
it and the following parts intact
