Bug#998166: Upstream PR

2023-05-04 Thread Vincent Legoll
This bug is maybe related to :

https://github.com/collectd/collectd/pull/3974

-- 
Vincent Legoll



Bug#872505: backports-website: "stretch" link misnamed

2017-08-17 Thread Vincent Legoll
Package: backports-website
Severity: normal

Dear Maintainer,

The link to:
http://packages.debian.org/stretch-backports/
is named "jessie-backports" on page:
https://backports.debian.org/Packages/
it should be named "stretch-backports" instead.

Please merge the attached git patch to fix this.



-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.12.0+ (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From e4e4760a093abcbc00afa346c9753bd05c649624 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Thu, 17 Aug 2017 23:05:48 +0200
Subject: [PATCH] Fix link to stretch backports overview

Signed-off-by: Vincent Legoll 
---
 Packages.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages.mdwn b/Packages.mdwn
index 31cb0f9..6bb6143 100644
--- a/Packages.mdwn
+++ b/Packages.mdwn
@@ -2,7 +2,7 @@
 
 If you are interested in a browseable directory included in debian-backports, you can use these overviews: 
 
-http://packages.debian.org/stretch-backports/";>jessie-backports
+http://packages.debian.org/stretch-backports/";>stretch-backports
 http://packages.debian.org/jessie-backports/";>jessie-backports
 http://packages.debian.org/jessie-backports-sloppy/";>jessie-backports-sloppy
 
-- 
2.7.4



Bug#790851: Manual fix

2015-07-05 Thread Vincent Legoll
Temporary hack^Wworkaround until a real fixed package appears in mirrors...

cd /tmp
mkdir tmp
dpkg-deb -R /var/cache/apt/archives/autoconf-archive_20150224-1_all.deb tmp
sed -i -e 
's|/usr/share/autoconf-archive/html/|/usr/share/autoconf-archive/html|'
tmp/DEBIAN/postrm
sed -i -e 
's|/usr/share/autoconf-archive/html/|/usr/share/autoconf-archive/html|'
tmp/DEBIAN/postinst
sed -i -e 
's|/usr/share/autoconf-archive/html/|/usr/share/autoconf-archive/html|'
tmp/DEBIAN/preinst
dpkg-deb -b tmp fixed.deb
dpkg -i fixed.deb

-- 
Vincent Legoll


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#790851: me too

2015-07-02 Thread Vincent Legoll
Same here, confirmed

how can it be that this was not catched automatically before reaching
the repository ?
Is there a check missing somewhere in the process ?

-- 
Vincent Legoll


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#788567: [Pkg-openssl-devel] Bug#788567: Bug#788567: libssl1.0.0: wpa_supplicant fails to authenticate

2015-06-29 Thread Vincent Legoll
I finally foud what broke, after stumbling on this:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790326


Also some help here:
https://bugzilla.kernel.org/show_bug.cgi?id=100621

Now I just have to find where to change wpa_supplicant back to using "wext"...

On Wed, Jun 24, 2015 at 11:08 PM, Kurt Roeckx  wrote:
> On Wed, Jun 24, 2015 at 10:24:31PM +0200, Vincent Legoll wrote:
>> Hello,
>>
>> Some time ago (I'll say about a month ago) my wifi stopped working, as
>> I had not time to investigate back then, I used eth0 instead.
>>
>> Now that I'm willing to investigate that issue, I stumbled upon this
>> bug report which looks like a good candidate, but...
>>
>> I already am on libssl-1.0.2c-1
>>
>> So how would I check this is really what I'm experiencing ?
>
> Maybe you also have a new version of wpa, something else
> related to the network, or kernel?
>
> You can always try to downgrade libssl to the 1.0.2a-1 version to
> see if that fixes anything, but I doubt it.
>
>
> Kurt
>



-- 
Vincent Legoll


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#788567: [Pkg-openssl-devel] Bug#788567: libssl1.0.0: wpa_supplicant fails to authenticate

2015-06-24 Thread Vincent Legoll
Hello,

Some time ago (I'll say about a month ago) my wifi stopped working, as
I had not time to investigate back then, I used eth0 instead.

Now that I'm willing to investigate that issue, I stumbled upon this
bug report which looks like a good candidate, but...

I already am on libssl-1.0.2c-1

So how would I check this is really what I'm experiencing ?

debian unstable
lspci : 02:00.0 Network controller: Intel Corporation WiFi Link 5100
kernel 4.1.0-rc7-00461-gc8d17b4
(but I got the same problem with previous kernels)

more infos on request

-- 
Vincent Legoll


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#755921: libgl1-mesa-dri-dbg: debug version of i965_dri.so missing

2014-09-07 Thread Vincent Legoll
On Thu, 24 Jul 2014 15:18:48 -0400 Tomas Janousek  wrote:
> On Thu, Jul 24, 2014 at 08:48:26PM +0200, Sven Joachim wrote:
> > So i965_dri.so has five hardlinks, but dh_strip can only strip it once,
> > and only one of those five names will end up in libgl1-mesa-dri-dbg.
>
> Well, that at least gives me a workaround.  Thanks a lot.  :-)

Could you share your workaround with the rest of us ?

+1 on the bug, ME TOO
+1 for the regression...


Bug#659364: libopenal1: Please enable -dbg package again

2014-08-14 Thread Vincent Legoll
Package: libopenal-dev
Version: 1:1.15.1-3
Followup-For: Bug #659364

Dear Maintainer,

   * What led up to the situation?

trying to debug a segfault in freeorion, which use libopenal

   * What exactly did you do (or not do) that was effective (or
 ineffective)?

run freeorion under gdb, and tried to get useful infos, like backtrace, etc...

   * What was the outcome of this action?

missing meaningful infos because the lack of debug infos in libopenal

   * What outcome did you expect instead?

full debug infos

Please consider distributing again the libopenal-dbg package, thanks...



-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libopenal-dev depends on:
ii  libopenal1  1:1.15.1-3

libopenal-dev recommends no packages.

libopenal-dev suggests no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#624589: clang++-libc++

2014-08-11 Thread Vincent Legoll
LLVM maintainer told that clang++-libc++ is temporary workaround, that will
get modified in the future, let's not do anything with it for now...

-- 
Vincent Legoll


Bug#624589: clang support

2014-08-11 Thread Vincent Legoll
Package: ccache
Version: 3.1.9-1
Followup-For: Bug #624589

Dear Maintainer,

The following patch makes the trigger script consider llvm-clang compilers
and adds appropriate symlinks to /usr/lib/ccache.

Please check the ccache.triggers.in use as I don't know if this will work
properly.

I did nothing wrt clang++-libc++ as this one is not versionned and I don't know
its status, it may be wise to check that with debian LLVM maintainers...

I only tested manually launching the script to check the symlinks creation...

Please advise if something needs to be done differently.

This patch is provided under whatever version of the GPL is required by debian

>From f22cd9021516ea4080624adafa4806eeeac7fcf8 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Mon, 11 Aug 2014 08:26:01 +0200
Subject: [PATCH] Updated to also consider llvm-clang for the /usr/lib/ccache
 compiler symlinks
To: vincent.leg...@gmail.com

---
 debian/ccache.triggers.in|  1 +
 debian/update-ccache-symlinks.in | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/debian/ccache.triggers.in b/debian/ccache.triggers.in
index bd5b1ef..fe25a92 100644
--- a/debian/ccache.triggers.in
+++ b/debian/ccache.triggers.in
@@ -1,2 +1,3 @@
 interest /usr/lib/gcc
 interest /usr/lib/%DEB_HOST_MULTIARCH%/gcc
+interest /usr/lib/llvm*
diff --git a/debian/update-ccache-symlinks.in b/debian/update-ccache-
symlinks.in
index 0fbdecf..7662de2 100644
--- a/debian/update-ccache-symlinks.in
+++ b/debian/update-ccache-symlinks.in
@@ -23,6 +23,12 @@ sub consider_gcc {
 consider "${prefix}g++${suffix}";
 }

+sub consider_clang {
+my ($suffix) = @_;
+consider "clang${suffix}";
+consider "clang++${suffix}";
+}
+
 # Find existing standard compiler names.
 foreach (@standard_names) {
 consider $_;
@@ -44,6 +50,15 @@ foreach my $dir (<$old_gcc_dir/*>, <$new_gcc_dir/*>) {
 }
 }

+# Find existing LLVM-clang variants.
+consider_clang "";
+foreach () {
+if (! -l $_ and -d $_) {
+s|.*/llvm-||;
+consider_clang "-$_";
+}
+}
+
 # Find existing symlinks.
 foreach (<$ccache_dir/*>) {
 if (-l) {
--
2.1.0.rc1



-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ccache depends on:
ii  libc6   2.19-7
ii  zlib1g  1:1.2.8.dfsg-1

ccache recommends no packages.

Versions of packages ccache suggests:
pn  distcc  

-- no debconf information
>From f22cd9021516ea4080624adafa4806eeeac7fcf8 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Mon, 11 Aug 2014 08:26:01 +0200
Subject: [PATCH] Updated to also consider llvm-clang for the /usr/lib/ccache
 compiler symlinks
To: vincent.leg...@gmail.com

---
 debian/ccache.triggers.in|  1 +
 debian/update-ccache-symlinks.in | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/debian/ccache.triggers.in b/debian/ccache.triggers.in
index bd5b1ef..fe25a92 100644
--- a/debian/ccache.triggers.in
+++ b/debian/ccache.triggers.in
@@ -1,2 +1,3 @@
 interest /usr/lib/gcc
 interest /usr/lib/%DEB_HOST_MULTIARCH%/gcc
+interest /usr/lib/llvm*
diff --git a/debian/update-ccache-symlinks.in b/debian/update-ccache-symlinks.in
index 0fbdecf..7662de2 100644
--- a/debian/update-ccache-symlinks.in
+++ b/debian/update-ccache-symlinks.in
@@ -23,6 +23,12 @@ sub consider_gcc {
 consider "${prefix}g++${suffix}";
 }
 
+sub consider_clang {
+my ($suffix) = @_;
+consider "clang${suffix}";
+consider "clang++${suffix}";
+}
+
 # Find existing standard compiler names.
 foreach (@standard_names) {
 consider $_;
@@ -44,6 +50,15 @@ foreach my $dir (<$old_gcc_dir/*>, <$new_gcc_dir/*>) {
 }
 }
 
+# Find existing LLVM-clang variants.
+consider_clang "";
+foreach () {
+if (! -l $_ and -d $_) {
+s|.*/llvm-||;
+consider_clang "-$_";
+}
+}
+
 # Find existing symlinks.
 foreach (<$ccache_dir/*>) {
 if (-l) {
-- 
2.1.0.rc1



Bug#745888: Cool, it's fixed

2014-07-09 Thread Vincent Legoll
I tested the new revision and the bug is fixed. Thanks a lot

-- 
Vincent Legoll


Bug#745888: libmtp9: Does not list photos from android phone properly (regression)

2014-04-26 Thread Vincent Legoll
Package: libmtp9
Version: 1.1.6-51-g1a2669c~ds0-1
Severity: important

Dear Maintainer,

   * What led up to the situation?

Yesterday a new version of the following packages got installed :

$ grep "status installed" /var/log/dpkg.log | grep mtp
2014-04-25 18:49:10 status installed libmtp-common:all 1.1.6-51-g1a2669c~ds0-1
2014-04-25 18:49:10 status installed libmtp9:amd64 1.1.6-51-g1a2669c~ds0-1
2014-04-25 18:49:10 status installed libmtp-runtime:amd64
1.1.6-51-g1a2669c~ds0-1

   * What exactly did you do (or not do) that was effective (or
 ineffective)?

I tried with different filemanager apps
* Thunar 1.6.3
* Files 3.8.2

   * What was the outcome of this action?

I get different results but none correctly listing files, some are missing,
there's directories there that shouldn't be present

And the folder content of my phone camera pictures is now wrong, whereas it was
good the day before with the older versions

The "File" filesystem browser app displaying
"mtp://[usb:002,005]/Phone/DCIM/Camera" list is missing a lot of files that are
present on the phone.
Instead it got some directories in the listing, that were never there, and are
not on the phone :

Music, Pictures, Podcast, Ringtones

When browsing into those, and when getting back to the root
"mtp://[usb:002,005]/Phone/DCIM/Camera" I don't always get the same listing as
a minute earlier

The listing in thunar even shows multiple directories with the same name

   * What outcome did you expect instead?

A flat list of photo files, as with previous versions

NOTE :

MTP is really worse than USB storage but that was removed from android, hate
that...



-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.15.0-rc1-00137-g81cef0f (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libmtp9 depends on:
ii  dpkg   1.17.6
ii  libc6  2.18-4
ii  libgcrypt111.5.3-4
ii  libmtp-common  1.1.6-51-g1a2669c~ds0-1
ii  libusb-1.0-0   2:1.0.18-2
ii  multiarch-support  2.18-4

Versions of packages libmtp9 recommends:
ii  libmtp-runtime  1.1.6-51-g1a2669c~ds0-1
ii  udev204-8

libmtp9 suggests no packages.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#511027: meld: Up/Down sometimes skip changes

2009-04-27 Thread Vincent Legoll
Please try with 1.3.0 or git master branch with the preference
"ignore changes which delete or add blank lines" unset.
It should be fixed.

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#470781: meld: Scroll modifier 'sticks' when window loses focus

2009-04-20 Thread Vincent Legoll
upstream bug (and patch fixing it)
http://bugzilla.gnome.org/show_bug.cgi?id=579643

could you test the patch ? (against meld-1.3.0 or svn rev 1351)

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#465804: assert self.deleted_lines_pending == -1

2009-04-16 Thread Vincent Legoll
please try the patch
http://bugzilla.gnome.org/attachment.cgi?id=132682
in upstream bug
http://bugzilla.gnome.org/show_bug.cgi?id=578303
it should fix this

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#506386: meld: "Version control" filter needs updating for current version control systems

2009-04-16 Thread Vincent Legoll
Committed in r1335 of svn trunk

fixed uptream
not released, but soon

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#432928: Does not recognize RCS metadata as such.

2009-04-16 Thread Vincent Legoll
Should be fixed more generically by meld svn trunk r1335

fixed upstream
not released, but soon

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#428843: meld issues an error with comparing files managed with mercurial.

2009-04-11 Thread Vincent Legoll
fixed in upstream meld svn trunk as of r1342

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#471297: meld: pyton error after 'svn move'

2009-04-11 Thread Vincent Legoll
I committed a fix for the crash in meld svn trunk revision 1332,
but that will only fix the backtrace, you'll still get the "Patch failed"
error dialog. This is better but not the full, more involved fix, of
only diffing "modified" files.

That will be fixed by another patch, still to be developped.

A release of meld is being prepared, so that bug should be able
to get closed soon.

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#200895: [PATCH] patch: strange "file seems to be locked" error

2009-04-11 Thread Vincent Legoll
I reported that bug upstream, and attached a
patch that fix the default behaviour.

https://savannah.gnu.org/bugs/index.php?26148

-- 
Vincent Legoll
From 25dfd69675d7a2888ba96df450edf797a506ac93 Mon Sep 17 00:00:00 2001
From: Vincent Legoll 
Date: Sat, 11 Apr 2009 16:44:59 +0200
Subject: [PATCH] Patch should default to not try to get files from revision
 control software unless actively asked by the user with
 the "-g" or "--get" command-line switches or the PATCH_GET
 environment variable.

Make the posixly correct behaviour of not using source
control, the global patch default. I.e. default to "-g0".

This is related to debian BTS bug: #200895
Please refer to that discussion for more background
information and discussion.
---
 patch.man   |4 +---
 src/patch.c |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/patch.man b/patch.man
index 2720090..54e5ba0 100644
--- a/patch.man
+++ b/patch.man
@@ -392,9 +392,7 @@ and does not get the file; and if negative,
 asks the user whether to get the file.
 The default value of this option is given by the value of the
 .B PATCH_GET
-environment variable if it is set; if not, the default value is zero if
-.B patch
-is conforming to \s-1POSIX\s0, negative otherwise.
+environment variable if it is set; if not, the default value is zero.
 .TP
 .B "\*=help"
 Print a summary of options and exit.
diff --git a/src/patch.c b/src/patch.c
index 59c6fb0..ba62958 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
 backup_if_mismatch = ! posixly_correct;
 patch_get = ((val = getenv ("PATCH_GET"))
 		 ? numeric_string (val, true, "PATCH_GET value")
-		 : posixly_correct - 1);
+		 : 0);
 
 val = getenv ("SIMPLE_BACKUP_SUFFIX");
 simple_backup_suffix = val && *val ? val : ".orig";
-- 
1.5.6.3



Bug#428843: meld issues an error with comparing files managed with mercurial

2009-04-01 Thread Vincent Legoll
On Thu, Apr 2, 2009 at 12:38 AM, Trent W. Buck  wrote:
> On Wed, Apr 01, 2009 at 10:08:32PM +0200, Vincent Legoll wrote:
>> I don't understand your patch, my mercurial outputs
>>
>> diff -r 75ef8a4a74ad testdir/testsubdir/testsubdir.txt
>>
>> and not "diff --git"
>
> OK, perhaps it is because my .hgrc contains
>
>    [diff]
>    git = True
>
> ...because that's what I like on the command line, and meld doesn't
> understand to turn that off when it uses mercurial for its own
> purposes.

OK, I wasn't aware of that hg diff mode.

But why turn it off when we can handle it properly ? ;-)

Could you also try the attached patch (which is against r1312)
it tries to handle both hg diff modes. I tested it on hg standard
& git modes + svn  (for non regression)

-- 
Vincent Legoll
Index: vc/mercurial.py
===
--- vc/mercurial.py	(revision 1312)
+++ vc/mercurial.py	(working copy)
@@ -31,7 +31,8 @@
 NAME = "Mercurial"
 VC_DIR = ".hg"
 PATCH_STRIP_NUM = 1
-PATCH_INDEX_RE = "^diff -r \w+ (.*)$"
+# Mercurial diff can be run in "git" mode
+PATCH_INDEX_RE = "^(?:diff -r \w+ (.*))|(?:diff --git a/(.*) b/.*)$"
 
 def commit_command(self, message):
 return [self.CMD,"commit","-m",message]
Index: vc/_vc.py
===
--- vc/_vc.py	(revision 1312)
+++ vc/_vc.py	(working copy)
@@ -111,7 +111,14 @@
 
 def get_patch_files(self, patch):
 regex = re.compile(self.PATCH_INDEX_RE, re.M)
-return [f.strip() for f in regex.findall(patch)]
+def pick(f):
+if isinstance(f, str):
+return f
+for item in f:
+if item:
+return item
+return None
+return [pick(f).strip() for f in regex.findall(patch)]
 
 def listdir_filter(self, entries):
 return [f for f in entries if f != self.VC_DIR]


Bug#428843: meld issues an error with comparing files managed with mercurial

2009-04-01 Thread Vincent Legoll
I don't understand your patch, my mercurial outputs

diff -r 75ef8a4a74ad testdir/testsubdir/testsubdir.txt

and not "diff --git"

Do you have a reference to the upstream discussion ?

BTW, a new release is baking, please test with meld trunk:

##
svn co  svn://svn.gnome.org/svn/meld/trunk
cd trunk
./meld /path/to/hg/repo
######

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#506386: meld: "Version control" filter needs updating for current version control systems

2009-04-01 Thread Vincent Legoll
the patch is against meld svn trunk r1294

try it with :

##
svn co  svn://svn.gnome.org/svn/meld/trunk
cd trunk
patch -p0 < /path/to/dowloaded/patch
./meld /path/to/git_or_hg_or_etc/repo
##

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org



Bug#506386: meld: "Version control" filter needs updating for current version control systems

2009-04-01 Thread Vincent Legoll
Hello,

I found your bug report about a feature I implemented few days ago... ;-)
Please test if the attached patch works OK for you and report status.
I hope to commit it to svn before next release.

-- 
Vincent Legoll
Index: misc.py
===
--- misc.py	(revision 1294)
+++ misc.py	(working copy)
@@ -298,6 +298,10 @@
 else:
 copy2(srcname, dstname)
 
+def shell_escape(glob_pat):
+# TODO: handle all cases
+return glob_pat.replace('{', '[{]').replace('}', '[}]')
+
 def shell_to_regex(pat):
 """Translate a shell PATTERN to a regular expression.
 
Index: vc/monotone.py
===
--- vc/monotone.py	(revision 1299)
+++ vc/monotone.py	(working copy)
@@ -29,6 +29,7 @@
 class Vc(_vc.Vc):
 CMD = "mtn"
 NAME = "Monotone"
+VC_METADATA = ['MT', '_MTN']
 PATCH_STRIP_NUM = 0
 PATCH_INDEX_RE = "^[+]{3,3} ([^  ]*)\t[0-9a-f]{40,40}$"
 
Index: vc/__init__.py
===
--- vc/__init__.py	(revision 1294)
+++ vc/__init__.py	(working copy)
@@ -34,6 +34,17 @@
 return ret
 _plugins = load_plugins()
 
+def get_plugins_metadata():
+ret = []
+for p in _plugins:
+# Some plugins have VC_DIR=None until instanciated
+if p.Vc.VC_DIR:
+ret.append(p.Vc.VC_DIR)
+# Most plugins have VC_METADATA=None
+if p.Vc.VC_METADATA:
+ret.extend(p.Vc.VC_METADATA)
+return ret
+
 def get_vcs(location):
 """Pick only the Vcs with the longest repo root
 
Index: vc/_vc.py
===
--- vc/_vc.py	(revision 1295)
+++ vc/_vc.py	(working copy)
@@ -71,6 +71,7 @@
 PATCH_STRIP_NUM = 0
 PATCH_INDEX_RE = ''
 VC_DIR = None
+VC_METADATA = None
 
 def __init__(self, location):
 self.root = self.find_repo_root(location)
Index: vc/tla.py
===
--- vc/tla.py	(revision 1297)
+++ vc/tla.py	(working copy)
@@ -62,6 +62,7 @@
 CMD = "tla"
 NAME = "Arch"
 VC_DIR = "{arch}"
+VC_METADATA = ['.arch-ids', '.arch-inventory']
 PATCH_STRIP_NUM = 1
 PATCH_INDEX_RE = "--- orig/(.*)"
 
Index: meldapp.py
===
--- meldapp.py	(revision 1296)
+++ meldapp.py	(working copy)
@@ -36,6 +36,7 @@
 import vcview
 import dirdiff
 import task
+import vc
 
 # optional
 sourceview_available = 0
@@ -413,7 +414,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 RCS\n") + \
+_("Version Control\t1\t%s\n") % misc.shell_escape(' '.join(vc.get_plugins_metadata())) + \
 #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


Bug#509069: Dotfiles and removals not listed by vc/darcs.py

2009-04-01 Thread Vincent Legoll
Please test with meld svn trunk, it should be fixed after revision r1226

-- 
Vincent Legoll



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org