Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2251 from groni/master

Browse Source 
change kdepim-common paths while file conflicts
This commit is contained in:
yusuf
2016-10-13 13:16:27 +03:00
committed by GitHub
parent 02a052977c c936aae511
commit ddc582a658
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/kdepim-common/pspec.xml
+1 -6
View File
@@ -72,7 +72,6 @@
<Dependency>karchive</Dependency> <Dependency>karchive</Dependency>
<Dependency>kjobwidgets</Dependency> <Dependency>kjobwidgets</Dependency>
<Dependency>qt5-webengine</Dependency> <Dependency>qt5-webengine</Dependency>
<Dependency>akonadi-contacts</Dependency>
<Dependency>kcalcore</Dependency> <Dependency>kcalcore</Dependency>
<Dependency>kcontacts</Dependency> <Dependency>kcontacts</Dependency>
<Dependency>kconfig</Dependency> <Dependency>kconfig</Dependency>
@@ -93,9 +92,7 @@
<Dependency>prison-qt5</Dependency> <Dependency>prison-qt5</Dependency>
<Dependency>akonadi</Dependency> <Dependency>akonadi</Dependency>
<Dependency>libkdepim</Dependency> <Dependency>libkdepim</Dependency>
<Dependency>akonadi-calendar</Dependency> <Dependency>akonadi-contacts</Dependency>
<Dependency>akonadi-search</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>kdoctools</Dependency> <Dependency>kdoctools</Dependency>
<Dependency>knewstuff</Dependency> <Dependency>knewstuff</Dependency>
<Dependency>kpimtextedit</Dependency> <Dependency>kpimtextedit</Dependency>
@@ -111,8 +108,6 @@
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/mime</Path> <Path fileType="data">/usr/share/mime</Path>
<Path fileType="data">/usr/share/icons</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/dbus-1</Path> <Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="data">/usr/share/config.kcfg</Path> <Path fileType="data">/usr/share/config.kcfg</Path>
<Path fileType="data">/usr/share/kf5</Path> <Path fileType="data">/usr/share/kf5</Path>