Date: Saturday, January 29, 2011 @ 02:09:55
Author: ronald
Revision: 108042
upgpkg: grub2 1.99~rc1-2
remove conflicts with grub2; fix typo in install message
Modified:
grub2/trunk/PKGBUILD
grub2/trunk/grub2.install
---------------+
PKGBUILD | 4 ++--
grub2.install | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-01-29 06:39:30 UTC (rev 108041)
+++ PKGBUILD 2011-01-29 07:09:55 UTC (rev 108042)
@@ -11,7 +11,7 @@
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase="grub2"
pkgver='1.99~rc1'
-pkgrel=1
+pkgrel=2
url="http://www.gnu.org/software/grub/";
arch=('i686' 'x86_64')
license=('GPL3')
@@ -136,7 +136,7 @@
pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for
all platforms"
install="grub2.install"
depends=('xz' 'freetype2' 'device-mapper')
- conflicts=('grub2' 'grub')
+ conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
cd ${srcdir}/grub2_bios-${pkgver}
Modified: grub2.install
===================================================================
--- grub2.install 2011-01-29 06:39:30 UTC (rev 108041)
+++ grub2.install 2011-01-29 07:09:55 UTC (rev 108042)
@@ -4,7 +4,7 @@
echo "done."
cat << EOF
- An example config file is created at /boot/gru/grub.cfg.example
+ An example config file is created at /boot/grub/grub.cfg.example
For more information and additional config settings please see
http://wiki.archlinux.org/index.php/GRUB2
