Added conflicting package mkinitcpio-fbsplash.

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbf98f13decf..9a72744faf80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,7 @@ pkgbase = fbsplash
 	optdepends = python: convert themes from splashy to fbsplash
 	conflicts = fbsplash-scripts
 	conflicts = initscripts-fork
+	conflicts = mkinitcpio-fbsplash
 	options = !makeflags
 	backup = etc/conf.d/fbcondecor
 	backup = etc/conf.d/splash
diff --git a/PKGBUILD b/PKGBUILD
index 35fae5282a67..92406257fe59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ optdepends=('linux-fbcondecor: enable console background images'
             'fbsplash-extras: additional functionality like daemon icons'
             'uswsusp-fbsplash: suspend to disk with fbsplash'
             'python: convert themes from splashy to fbsplash')
-conflicts=('fbsplash-scripts' 'initscripts-fork')
+conflicts=('fbsplash-scripts' 'initscripts-fork' 'mkinitcpio-fbsplash')
 options=('!makeflags')
 backup=('etc/conf.d/fbcondecor' 'etc/conf.d/splash')
 install=fbsplash.install