Message: previous - next
Month: February 2014

R: [trinity-devel] Commit c926c513 (amarok) caused a conflict between packages

From: Michele Calgaro <michele.calgaro@...>
Date: Fri, 14 Feb 2014 01:46:26 +0000 (GMT)
> Hi all,
> within commit c926c513 been moved "all" Amarok icons from the folder 
> share/apps/amarok/icons to common folder share/icons. This has resulted in a 
> file conflict between other packages. In my case, I noticed conflict on 
> babelfish.png from amarok × konq-plugins (tdeaddons). 
> With this commit was moved to a common folder some icons with too general 
> names, which are very potential source of conflicts. For example: 
> collection.png, dynamic.png, mini_dock.png, random.png, visualizations.png.
> How to solve it? Rename icons to have the prefix amarok_ (many other icons is 
> named like this)? Move the icons back and into common folder move only 
> necessary icons? Any other ideas?
> Note: It seems that it will be necessary to check whether not exists some 
> another conflicts. Michele, please could you check conflicts using your local 
> repository of binary packages?

Slavek, I confirm the problem with amarok and konq-plugins.
Actually I had already discovered this problem a couple of days ago when I did a full TDE rebuild, but haven't got time to look at (btw, until the end of the next week I have very little time for TDE development :( )
Now I am not on a TDE machine, but later today I will check if there are other conflicts. By memory I remember having problem with 4 packages. Two are amarok and konq-plugins, the other two I don't remember now. They could be another conflict or it could just be a consequence of the amarok-konq-plugins conflict.
Later today I will update.

IMO, moving the icons back and moving into the common folder only the necessary icons is the most sensible solution