diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /libre/lilo/PKGBUILD | |
parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'libre/lilo/PKGBUILD')
-rw-r--r-- | libre/lilo/PKGBUILD | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD index 169037bc2..8103a1ac1 100644 --- a/libre/lilo/PKGBUILD +++ b/libre/lilo/PKGBUILD @@ -5,7 +5,7 @@ pkgname=lilo pkgver=23.2 -pkgrel=3 +pkgrel=3.1 pkgdesc="A bootloader for Linux (Parabola rebranded)" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/lilo/" @@ -19,9 +19,6 @@ backup=('etc/lilo.conf') depends=('device-mapper' 'coreutils') makedepends=('bin86' 'sharutils') optdepends=('perl: to use keytab-lilo') -replaces=('lilo') -conflicts=('lilo') -provides=("lilo=$pkgver") install=lilo.install options=('!makeflags') source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" |