On 7 November 2011 17:37, Balcaen John <[email protected]> wrote: > Hello neoclust, > We found a conflict regarding digikam packaging (yes i know you're the one in > charge :p ) > > Le lundi 7 novembre 2011 17:00:23 Donald Stewart a écrit : >> We have conflicts: > [...] >> Preparing... >> ############################################# Installation failed: file >> /usr/share/icons/oxygen/128x128/apps/digikam.png from install of >> digikam-1:2.3.0-1.mga2.x86_64 conflicts with file from package >> oxygen-icon-theme-1:4.7.3-1.mga2.noarch >> file /usr/share/icons/oxygen/16x16/apps/digikam.png from >> install of digikam-1:2.3.0-1.mga2.x86_64 conflicts with file from >> package oxygen-icon-theme-1:4.7.3-1.mga2.noarch > [..] >> file /usr/share/icons/oxygen/22x22/apps/showfoto.png from >> install of showfoto-1:2.3.0-1.mga2.x86_64 conflicts with file from >> package oxygen-icon-theme-1:4.7.3-1.mga2.noarch > [...] > thoses files where initially available in usr/share/icons/hicolor/*/apps for > digikam < 2.3.0 & available in /usr/share/icons/oxygen/*/apps on our oxygen- > icon-theme. > > So should we drop thoses files from oxygen-icon-theme, patch digikam to put > thoses files where they were installed initially ? > > Regards, > > -- > Balcaen John > Jabber-id: [email protected] >
I would say that we go with the upstream way as it were, so patch digikam and drop them from oxygen. That way, if digikam change there icons, it will show up for us.
