diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-02-12 18:35:11 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-02-12 18:35:11 (GMT) |
| commit | ee8437858ec0decf6ce36dfda90abde61f025016 (patch) | |
| tree | c72a50b08c98959022abc83bb4e7f2990a058f3b /abs/core-testing/fbsplash/PKGBUILD | |
| parent | ebbb20c55cb45ade45636694a9ef83f6138ab122 (diff) | |
| parent | 8e38d056d05f4891acd61b8b242eeda433619f6c (diff) | |
| download | linhes_pkgbuild-ee8437858ec0decf6ce36dfda90abde61f025016.zip linhes_pkgbuild-ee8437858ec0decf6ce36dfda90abde61f025016.tar.gz linhes_pkgbuild-ee8437858ec0decf6ce36dfda90abde61f025016.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts:
abs/core-testing/fbsplash/PKGBUILD
Diffstat (limited to 'abs/core-testing/fbsplash/PKGBUILD')
| -rw-r--r-- | abs/core-testing/fbsplash/PKGBUILD | 6 |
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 \ |