Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread Raymond Wood
On Sun, Mar 06, 2005 at 11:46:09PM +0100, EikeSauer imagined: > Am Sonntag, 6. März 2005 22:35 schrieb Matt Brubeck: > > martin f krafft wrote: > > > Nice. Do people know about something like this for the console, > > > or, if it has to be graphical, for GTK? > > > > "Meld" is a similar tool for GT

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread EikeSauer
Am Sonntag, 6. März 2005 22:35 schrieb Matt Brubeck: > martin f krafft wrote: > > Nice. Do people know about something like this for the console, or, if > > it has to be graphical, for GTK? > > "Meld" is a similar tool for GTK/GNOME: If it musn't pull in KDE libs, I'd recommend "meld" as well. Ci

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread Matt Brubeck
martin f krafft wrote: > > For merging two files (A and B), it opens a third plane where you > > can adopt version A or B for every differing part of the file. > > You'll find screenshots here: http://kdiff3.sourceforge.net/ > > Nice. Do people know about something like this for the console, or, i

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread martin f krafft
also sprach [EMAIL PROTECTED] <[EMAIL PROTECTED]> [2005.03.06.2203 +0100]: > You are not forced to use the rest of KDE or kdevelop with it > and I guess the kdelibs are somewhat smaller... After unpacking 63.2MB of additional disk space will be used. okay, you win. > > Does it allow for individ

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread EikeSauer
Am Sonntag, 6. März 2005 21:19 schrieb martin f krafft: > ... and thus cannot be used without 150 Mb of additional software > I would never need otherwise, right? You are not forced to use the rest of KDE or kdevelop with it and I guess the kdelibs are somewhat smaller... > Does it allow for ind

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread Philipp Kern
On 6 Mar 2005, at 21:19, martin f krafft wrote: ... and thus cannot be used without 150 Mb of additional software I would never need otherwise, right? It is already in Debian. It's about a new revision. Kind regards, Philipp Kern Debian Developer PGP.sig Description: This is a digitally signed me

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread martin f krafft
also sprach [EMAIL PROTECTED] <[EMAIL PROTECTED]> [2005.03.06.2034 +0100]: > kdiff3 is a graphical diff. I think the most useful difference to many > other diff programs is that the difference is shown by character, > not by line. Additionally, it integrates into KDE and kdevelop. ... and thus c

RFS: kdiff3 - compares and merges 2 or 3 files or directories

2005-03-06 Thread EikeSauer
Hi! I'm looking for someone to test and upload a kdiff3 package again. I maintain kdiff3 packages for many months now and improved the application by providing a man page and fixing a race condition. It's part of Sid and Sarge. kdiff3 is a graphical diff. I think the most useful difference to m

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Andreas Metzler
On Wed, Jun 16, 2004 at 06:15:38PM +0200, Eike zyro Sauer wrote: > Andreas Metzler schrieb: > > -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 > > 11:28:59 +0200 > > ^^^ > That's strange, I'm seeing a wrong mail address in > the changelog, but it is "[EMAIL PROTECT

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Eike \"zyro\" Sauer
Andreas Metzler schrieb: > -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 > 11:28:59 +0200 > ^^^ That's strange, I'm seeing a wrong mail address in the changelog, but it is "[EMAIL PROTECTED]"... Anyway, I changed it and uploaded again. (Should I change the version

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Andreas Metzler
On Wed, Jun 16, 2004 at 04:45:47PM +0200, Eike zyro Sauer wrote: > Packagename:kdiff3 > Version:0.9.86-1 [...] > http://user.cs.tu-berlin.de/~eikes/debian/kdiff3/ kdiff3 (0.9.86-1) unstable; urgency=low * New upstream release -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 11:

[RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Eike \"zyro\" Sauer
Hello! I maintain the kdiff3 package for many months now. I wrote a man page and solved an unreproducible bug. My changes where included in upstream. It is already included in Sarge, but my former sponsor is not reachable for me. So I'm looking for a new sponsor (and hopefully mentor). The new

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Andreas Metzler
On Wed, Jun 16, 2004 at 06:15:38PM +0200, Eike zyro Sauer wrote: > Andreas Metzler schrieb: > > -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 > > 11:28:59 +0200 > > ^^^ > That's strange, I'm seeing a wrong mail address in > the changelog, but it is "[EMAIL PROTECT

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Eike \"zyro\" Sauer
Andreas Metzler schrieb: > -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 > 11:28:59 +0200 > ^^^ That's strange, I'm seeing a wrong mail address in the changelog, but it is "[EMAIL PROTECTED]"... Anyway, I changed it and uploaded again. (Should I change the version

Re: [RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Andreas Metzler
On Wed, Jun 16, 2004 at 04:45:47PM +0200, Eike zyro Sauer wrote: > Packagename:kdiff3 > Version:0.9.86-1 [...] > http://user.cs.tu-berlin.de/~eikes/debian/kdiff3/ kdiff3 (0.9.86-1) unstable; urgency=low * New upstream release -- Eike Sauer <[EMAIL PROTECTED]> Tue, 15 Jun 2004 11:

[RFS] kdiff3 - compares and merges 2 or 3 files or directories

2004-06-16 Thread Eike \"zyro\" Sauer
Hello! I maintain the kdiff3 package for many months now. I wrote a man page and solved an unreproducible bug. My changes where included in upstream. It is already included in Sarge, but my former sponsor is not reachable for me. So I'm looking for a new sponsor (and hopefully mentor). The new

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Ayman Negm
On Fri, Nov 07, 2003 at 04:11:51PM +0100, Eike Sauer wrote: > Hello! > > While trying to do something useful for Debian by fixing > an RC bug, I needed a graphical diff and merge tool. > I found kdiff3 for KDE. I wondered why it is not yet > packaged, so it became my first public package. If ther

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Ayman Negm
On Fri, Nov 07, 2003 at 04:11:51PM +0100, Eike Sauer wrote: > Hello! > > While trying to do something useful for Debian by fixing > an RC bug, I needed a graphical diff and merge tool. > I found kdiff3 for KDE. I wondered why it is not yet > packaged, so it became my first public package. If ther

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Colin Watson
On Fri, Nov 07, 2003 at 04:11:51PM +0100, Eike Sauer wrote: > Another package - as pdebuild built it - is not installable > on my system due to dependency problems. > dpkg says: "kdiff3 depends on libc6 (>= 2.3.2.ds1-4)", but > I could not satisfy this with the most recent unstable libc. That's b

Re: RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Colin Watson
On Fri, Nov 07, 2003 at 04:11:51PM +0100, Eike Sauer wrote: > Another package - as pdebuild built it - is not installable > on my system due to dependency problems. > dpkg says: "kdiff3 depends on libc6 (>= 2.3.2.ds1-4)", but > I could not satisfy this with the most recent unstable libc. That's b

RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Eike Sauer
Hello! While trying to do something useful for Debian by fixing an RC bug, I needed a graphical diff and merge tool. I found kdiff3 for KDE. I wondered why it is not yet packaged, so it became my first public package. If there's a better graphical diff already in Debian, I'd really like to know

RFS: kdiff3 - compares and merges 2 or 3 files or directories

2003-11-07 Thread Eike Sauer
Hello! While trying to do something useful for Debian by fixing an RC bug, I needed a graphical diff and merge tool. I found kdiff3 for KDE. I wondered why it is not yet packaged, so it became my first public package. If there's a better graphical diff already in Debian, I'd really like to know