From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Dec 2013 16:13:24 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
X-Git-Tag: grub-2.02-beta2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c00c34efe1779fc8c0b9dbfb37b7168b58d2df96;p=thirdparty%2Fgrub.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
---

c00c34efe1779fc8c0b9dbfb37b7168b58d2df96
diff --cc ChangeLog
index 966c7773d,4bc407e18..2ce6a9568
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,23 @@@
+ 2013-12-20  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Be more verbose about some configure failures.
+ 
+ 2013-12-20  Colin Watson  <cjwatson@ubuntu.com>
+ 
+ 	Fix various build problems on GNU/Hurd.
+ 
+ 	* grub-core/osdep/unix/getroot.c (strip_extra_slashes): Move inside
+ 	!defined (__GNU__).
+ 	(xgetcwd): Likewise.
+ 	* include/grub/emu/hostdisk.h (grub_util_hurd_get_disk_info)
+ 	[__GNU__]: Add prototype.
+ 	* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__GNU__]: Format
+ 	long int using %ld rather than %d.
+ 
 +2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +	* util/grub-install.c: Inform user about install platform.
 +
  2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	* configure.ac: Set version to 2.02~beta1.