Merge pull request #2251 from groni/master

change kdepim-common paths while file conflicts
This commit is contained in:
yusuf
2016-10-13 13:16:27 +03:00
committed by GitHub
@@ -71,8 +71,7 @@
<Dependency>kwallet</Dependency>
<Dependency>karchive</Dependency>
<Dependency>kjobwidgets</Dependency>
<Dependency>qt5-webengine</Dependency>
<Dependency>akonadi-contacts</Dependency>
<Dependency>qt5-webengine</Dependency>
<Dependency>kcalcore</Dependency>
<Dependency>kcontacts</Dependency>
<Dependency>kconfig</Dependency>
@@ -92,10 +91,8 @@
<Dependency>qt5-phonon</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>akonadi</Dependency>
<Dependency>libkdepim</Dependency>
<Dependency>akonadi-calendar</Dependency>
<Dependency>akonadi-search</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>libkdepim</Dependency>
<Dependency>akonadi-contacts</Dependency>
<Dependency>kdoctools</Dependency>
<Dependency>knewstuff</Dependency>
<Dependency>kpimtextedit</Dependency>
@@ -110,9 +107,7 @@
<Path fileType="data">/usr/mkspecs/</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/mime</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="data">/usr/share/kservices5</Path>
<Path fileType="data">/usr/share/kservicetypes5</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="data">/usr/share/config.kcfg</Path>
<Path fileType="data">/usr/share/kf5</Path>