trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: February 2014

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

From: Slávek Banko <slavek.banko@...>
Date: Sun, 16 Feb 2014 02:33:55 +0100
On Friday 14 of February 2014 14:59:33 Michele Calgaro wrote:
> Slavek,
> I tried both ways.
>

Michele, thank you.

> Using your way (always good to learn something new :) ) I get the following
> list:
>
> -------------------------------
> opt/trinity/bin/tdesu

This is fine - in package tdesudo - is treated by divert.

> opt/trinity/lib/libksvnwidgets.so
> opt/trinity/lib/libsvnfrontend.so
> opt/trinity/lib/libsvnqt.so
> opt/trinity/lib/libsvnqt.so.4
> opt/trinity/lib/libsvnqt.so.4.2.2
> opt/trinity/lib/libtdesvncfgreader.so
> opt/trinity/lib/libtdesvnevents.so
> opt/trinity/lib/libtdesvnhelpers.so
> opt/trinity/share/services/svn+file.protocol
> opt/trinity/share/services/svn+http.protocol
> opt/trinity/share/services/svn+https.protocol
> opt/trinity/share/services/svn.protocol

This is a long time known conflict.

> opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop
> opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop

This is fine - in package dolphin - is treated by divert.

> opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png

Fixed in commit fcb296c8 (tde-packaging).

> opt/trinity/share/doc/tde/HTML/da/filelight/common
> opt/trinity/share/doc/tde/HTML/da/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/da/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/en/filelight/common
> opt/trinity/share/doc/tde/HTML/en/filelight/config_appear.png
> opt/trinity/share/doc/tde/HTML/en/filelight/config_scan.png
> opt/trinity/share/doc/tde/HTML/en/filelight/filemap.png
> opt/trinity/share/doc/tde/HTML/en/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/en/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/en/filelight/main.png
> opt/trinity/share/doc/tde/HTML/es/filelight/common
> opt/trinity/share/doc/tde/HTML/es/filelight/config_appear.png
> opt/trinity/share/doc/tde/HTML/es/filelight/config_scan.png
> opt/trinity/share/doc/tde/HTML/es/filelight/filemap.png
> opt/trinity/share/doc/tde/HTML/es/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/es/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/es/filelight/main.png
> opt/trinity/share/doc/tde/HTML/et/filelight/common
> opt/trinity/share/doc/tde/HTML/et/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/et/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/it/filelight/common
> opt/trinity/share/doc/tde/HTML/it/filelight/config_appear.png
> opt/trinity/share/doc/tde/HTML/it/filelight/config_scan.png
> opt/trinity/share/doc/tde/HTML/it/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/it/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/it/filelight/main.png
> opt/trinity/share/doc/tde/HTML/pt/filelight/common
> opt/trinity/share/doc/tde/HTML/pt/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/pt/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/ru/filelight/common
> opt/trinity/share/doc/tde/HTML/ru/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/ru/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/sv/filelight/common
> opt/trinity/share/doc/tde/HTML/sv/filelight/config_appear.png
> opt/trinity/share/doc/tde/HTML/sv/filelight/config_scan.png
> opt/trinity/share/doc/tde/HTML/sv/filelight/index.cache.bz2
> opt/trinity/share/doc/tde/HTML/sv/filelight/index.docbook
> opt/trinity/share/doc/tde/HTML/sv/filelight/main.png
> opt/trinity/share/locale/az/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/bg/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/br/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ca/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/cs/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/cy/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/da/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/de/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/el/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/en_GB/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/es/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/et/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/fr/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ga/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/gl/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/is/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/it/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ja/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ka/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/lt/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/nb/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/nl/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/pl/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/pt_BR/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/pt/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ro/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ru/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/rw/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/sr@Latn/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/sr/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/sv/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/ta/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/tr/LC_MESSAGES/filelight.mo
> opt/trinity/share/locale/uk/LC_MESSAGES/filelight.mo

filelight-l10n package is completely unnecessary.
In my build script I omit building this package.

> opt/trinity/share/icons/crystalsvg/22x22/actions/babelfish.png

Introduced by commit c926c513, fixed in commit 6d612f1f (amarok).

> opt/trinity/share/icons/hicolor/128x128/apps/kdict.png
> opt/trinity/share/icons/hicolor/128x128/apps/kppp.png
> opt/trinity/share/icons/hicolor/128x128/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/16x16/apps/kcmsambaconf.png
> opt/trinity/share/icons/hicolor/16x16/apps/kdict.png
> opt/trinity/share/icons/hicolor/16x16/apps/knewsticker.png
> opt/trinity/share/icons/hicolor/16x16/apps/kppp.png
> opt/trinity/share/icons/hicolor/16x16/apps/ksirc.png
> opt/trinity/share/icons/hicolor/16x16/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/22x22/apps/kppp.png
> opt/trinity/share/icons/hicolor/22x22/apps/ksirc.png
> opt/trinity/share/icons/hicolor/22x22/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/32x32/apps/kdict.png
> opt/trinity/share/icons/hicolor/32x32/apps/knewsticker.png
> opt/trinity/share/icons/hicolor/32x32/apps/kppp.png
> opt/trinity/share/icons/hicolor/32x32/apps/ksirc.png
> opt/trinity/share/icons/hicolor/32x32/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/48x48/apps/kdict.png
> opt/trinity/share/icons/hicolor/48x48/apps/knewsticker.png
> opt/trinity/share/icons/hicolor/48x48/apps/kppp.png
> opt/trinity/share/icons/hicolor/48x48/apps/ksirc.png
> opt/trinity/share/icons/hicolor/48x48/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/64x64/apps/kdict.png
> opt/trinity/share/icons/hicolor/64x64/apps/kppp.png
> opt/trinity/share/icons/hicolor/64x64/apps/ksirc.png
> opt/trinity/share/icons/hicolor/64x64/apps/kwifimanager.png
> opt/trinity/share/icons/hicolor/scalable/apps/kdict.svgz
> opt/trinity/share/icons/hicolor/scalable/apps/kwifimanager.svgz

Introduced by commit ca968f8d, fixed in commit caec7202 (tde-packaging).

> -----------------------------------------
>
> Using a full install (except a few packages that didn't install due to
> other missing dependencies), I also found: 1) filelight and filelight-l10n
> conflicts
> 2) libsvnqt-trinity has wrong dependency on libqt3-mt-dev when instead
> should be libtqt3-mt-dev (tqt3 not qt3)
>

Fixed in commit 6c9675c0 (tde-packaging).

> Cheers
>   Michele
>

Slavek
--