Merge pull request #1099 from alihanozturk/master

kdepim:libkdepim add dep kdepim-runtime
2016-01-24 18:52:08 +02:00
parent cca2133401 c1725c8af0
commit 24e05d852e
1 changed files with 2 additions and 1 deletions
@@ -158,6 +158,7 @@
            <Dependency>kmailtransport</Dependency>
            <Dependency>knotifications</Dependency>
            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kdepim-runtime</Dependency>
            <Dependency>akonadi-calendar</Dependency>
            <Dependency>kdelibs4-support</Dependency>
            <Dependency>kidentitymanagement</Dependency>
@@ -963,7 +964,7 @@
            <Package>kdepim</Package>
        </Replaces>
        <Conflicts>
-            <Package>kdepim</Package>
+            <Package>kdepim</Package>kontact
        </Conflicts>
    </Package>