diff options
author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/grub-legacy/PKGBUILD | |
parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'libre/grub-legacy/PKGBUILD')
-rw-r--r-- | libre/grub-legacy/PKGBUILD | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index dd7940c2c..036540e79 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -2,20 +2,18 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> +# Contributor (Parabola): Jorge López <jorginho@lavabit.com> pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=25 +pkgrel=25.1 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/grub/" depends=('ncurses' 'diffutils' 'sed') -conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64') -replaces=('grub') -provides=("grub=${pkgver}") +conflicts=('grub') [ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib') optdepends=('xfsprogs: freezing of xfs /boot in install-grub script') source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz |