git-difftool.txt has been removed in 1.3.7.45-1. I have forgotten to remove the symlink, my bad.
I have fixed this in git (see http://git.debian.org/?p=collab-maint/git-cola.git;a=commit;h=81de75b3ff253e2ccf4de34ad4170854bf21bbf4 ) 2009/5/10 Cristian Greco <cristian.deb...@gmail.com> > Package: git-cola > Version: > Severity: serious > Justification: Policy 7.6.1 > > Hi, > > I'm getting the following error while installing git-cola in sid: > > Unpacking git-cola (from .../git-cola_1.3.7.21-1_all.deb) ... > dpkg: error processing /var/cache/apt/archives/git-cola_1.3.7.21-1_all.deb > (--unpack): > trying to overwrite `/usr/share/man/man1/git-difftool.1.gz', which is also > in package git-core > dpkg-deb: subprocess paste killed by signal (Broken pipe) > > And this is the interesting output from the common manpage file: > > --- git-cola-1.3.7.21/share/doc/git-cola/git-difftool.txt > +++ git-core-1.6.3/Documentation/git-difftool.txt > 06:29:04.000000000 +0200 > @@ -103,8 +103,3 @@ > GIT > --- > Part of the linkgit:git[1] suite > - > - > -NOTE: git-difftool is an official git command of git-1.6.3. > -git-cola keeps a version around for compatibility with older > -versions of git only. > > Thanks, > Cristian > > > > -- System Information: > Debian Release: squeeze/sid > APT prefers unstable > APT policy: (500, 'unstable'), (1, 'experimental') > Architecture: i386 (i686) > > Kernel: Linux 2.6.29-2-686 (SMP w/1 CPU core) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/bash > > Versions of packages git-cola depends on: > ii git-core 1:1.6.3-1 fast, scalable, distributed > revisi > ii python 2.5.4-2 An interactive high-level > object-o > ii python-qt4 4.4.4-6 Python bindings for Qt4 > ii python-support 1.0.2 automated rebuilding support > for P > > Versions of packages git-cola recommends: > ii gitk 1:1.6.3-1 fast, scalable, distributed > revisi > > Versions of packages git-cola suggests: > pn python-pyinotify <none> (no description available) > ii python-simplejson 2.0.9-1 Simple, fast, extensible JSON > enco > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.9 (GNU/Linux) > > iEYEARECAAYFAkoHWmkACgkQdYzA9QwJWCXvRQCfdV4uUGgfuq6iSxXJ3XFNeA97 > CTgAn3jphQfQcMOK8wx7ebbWd2wy4P/t > =fLsj > -----END PGP SIGNATURE----- > > Cheers! -- Iulian Udrea iul...@ubuntu.com
