Re: RFS(3): kdiff3 - compares and merges 2 or 3 files or directories
On Tuesday 13 January 2004 01:44, Eike \ wrote:
> Hello!
>
> I'm still(*) looking for someone to test and upload the following package.
Hi,
I've rebuild kdiff3 on woody and had a quick look and test merge.
Only strange thing that I could spot is why there are:
drwxr-xr-x root/root 0 2004-01-12 02:15:47 ./usr/share/doc/kde/HTML/en/
drwxr-xr-x root/root 0 2004-01-12 02:15:48 ./usr/share/doc/kde/HTML/en/kdiff3/
-rw-r--r-- root/root 21727 2004-01-12 02:13:44 ./usr/share/doc/kde/HTML/en/kdiff3/index.cache.bz2
-rw-r--r-- root/root 70907 2004-01-12 02:11:51 ./usr/share/doc/kde/HTML/en/kdiff3/index.docbook
-rw-r--r-- root/root 7856 2003-12-22 09:01:09 ./usr/share/doc/kde/HTML/en/kdiff3/index.html
Dupicates of those files + html output + manpage(!) are also in
/usr/share/doc/HTML/en/kdiff3
> The diff file has become even smaller because upstream has accepted my
> man page in his new version.
Well, removing some duplicate docs will make the deb smaller too ;)
Nice pkgs, nice app!
Achim
> 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 well into KDE.
>
> Package name : kdiff3
> Version : 0.9.81
> URL : http://kdiff3.sourceforge.net
> License : GPL
> Description: compares and merges 2 or 3 files or directories
> KDiff3 compares two or three input files and shows the differences
> line by line and character by character. It provides an automatic
> merge facility and an integrated editor for comfortable solving of
> merge conflicts. KDiff3 allows recursive directory comparison and
> merging as well.
>
> The package lintian and linda clean. It can be found at:
> http://user.cs.tu-berlin.de/~eikes/debian/kdiff3/
>
> Ciao,
> Eike
>
> PS: Posted separately to *.mentors and *.qt-kde.
> How can I crosspost with gmane?
>
> (*) My former sponsor seems to be MIA (Rene, are you out there?).
>
>
>
> --
> To UNSUBSCRIBE, email to debian-qt-kde-request@lists.debian.org
> with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
>
>
>
--
To me vi is Zen. To use vi is to practice zen. Every command is
a koan. Profound to the user, unintelligible to the uninitiated.
You discover truth everytime you use it.
-- reddy@lion.austin.ibm.com
Reply to: