Please sync kdiff3 0.9.92-2 (universe) from Debian unstable (main)

[Marco Rodrigues]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects ubuntu/kdiff3
 status new
 subscribe ubuntu-universe-sponsors

Please sync kdiff3 0.9.92-1 (universe) from Debian unstable (main).

Explanation of the Ubuntu delta and why it can be dropped:
The kde4libs-dev that's included in the debian package depends on libacl1-dev and libattr1-dev, so don't need to add them to build depends directly. It builds fine in Hardy pbuilder.

Changelog since current hardy version 0.9.92-1ubuntu1:

kdiff3 (0.9.92-2) unstable; urgency=low

  * Include konqueror plugin in package (closes Ubuntu bug no. 145026)
  * Split package into kdiff3 and kdiff3-doc

 -- Eike Sauer <email address hidden> Tue, 11 Nov 2007 20:00:00 +0100

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHRJmFQGoC3MKACe8RAkrUAJ9fGalO+mqy2W8RAva6w2DqPW9L3wCdFgvN
FsqHzwXf3XoINwrH9kWvXss=
=T4d8
-----END PGP SIGNATURE-----

[Daniel Holbach (dholbach)]

What about the dh_iconcache change? (dh_icons now)

[Marco Rodrigues (gothicx)]

If you check Ubuntu patch, it's # dh_iconcache (commented), so it's not used. I don't even know why it's mentioned in the changelog.

http://patches.ubuntu.com/k/kdiff3/kdiff3_0.9.92-1ubuntu1.patch

[Daniel Holbach (dholbach)]

Please make it use dh_icons then.

[Marco Rodrigues (gothicx)]

Hi Marco!

Am Donnerstag, 22. November 2007 schrieben Sie:
> > Why not to include dh_icons into the debian/rules of kdiff3 package ?

I don't really understand the whole issue, it seems like it's about
fixing a Gnome bug in all other packages, instead of fixing it in
Gnome, but I'll have a look at it when I'm doing the next release
(which will probably come with the next upstream release, if no new
bugs are filed). Thanks for directing my attention to it!

Ciao,
  Eike

[Daniel Holbach (dholbach)]

It's not a GNOME bug. Ubuntu chose to use the GTK Icon Cache. For icons in /usr/share/icons a cache is generated/updated in the postinst. dh_iconcache used to do that, it's now dh_icons: https://wiki.ubuntu.com/UbuntuPackagingChanges#head-7a1029cb94855a96bf14f84ea79e9468febc7605

This package contains icons in /usr/share/icons/hicolor

[Marco Rodrigues (gothicx)]

So, latest ubuntu change is wrong, because it's: # dh_iconcache, it used a "#" before it.. I know now it's dh_icons, thanks for it! Let's see if Debian maintainer do something, so after we can sync this one.

[Sarah Kowalik (hobbsee-deactivatedaccount)]

nixternal has already done this merge,