Merge pull request #1100 from pisilinux/revert-1099-master

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