summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/fbsplash
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core-testing/fbsplash')
-rw-r--r--abs/core-testing/fbsplash/PKGBUILD6
1 files changed, 5 insertions, 1 deletions
diff --git a/abs/core-testing/fbsplash/PKGBUILD b/abs/core-testing/fbsplash/PKGBUILD
index 0074b7d..08d04b2 100644
--- a/abs/core-testing/fbsplash/PKGBUILD
+++ b/abs/core-testing/fbsplash/PKGBUILD
@@ -2,14 +2,18 @@
pkgname=fbsplash
pkgver=1.5.4.3
-pkgrel=4
+pkgrel=5
pkgdesc="A userspace implementation of a splash screen for Linux (formerly known as gensplash)"
arch=('i686' 'x86_64')
url="http://fbsplash.berlios.de"
license=('GPL')
backup=('etc/conf.d/fbsplash.conf')
makedepends=('klibc')
+<<<<<<< HEAD:abs/core-testing/fbsplash/PKGBUILD
depends=('initscripts' 'miscsplashutils' 'libjpeg' 'libpng' 'freetype2-static' 'gpm' 'libmng' 'which')
+=======
+depends=('initscripts' 'miscsplashutils' 'libjpeg' 'libpng' 'freetype2-static' 'gpm' 'libmng')
+>>>>>>> origin/HEAD:abs/core-testing/fbsplash/PKGBUILD
conflicts=('bootsplash' 'gensplash')
install=fbsplash.install
source=(http://download.berlios.de/fbsplash/splashutils-${pkgver}.tar.bz2 \