summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36087f92795a..c9fbd584a81d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,6 +29,7 @@ pkgbase = krita-git
depends = hicolor-icon-theme
provides = krita
conflicts = krita
+ conflicts = calligra-krita
source = git://anongit.kde.org/krita.git
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 204527b8c8d7..28041ce465ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -31,7 +31,7 @@ makedepends=('extra-cmake-modules'
'kwindowsystem'
)
provides=('krita')
-conflicts=('krita')
+conflicts=('krita' 'calligra-krita')
install=krita-git.install
source=('git://anongit.kde.org/krita.git')
sha1sums=('SKIP')