- 01_fix_grub-install.patch: merged upstream.

*

diff --git a/debian/changelog b/debian/changelog
index 27decaebac84721338fc4f9d103d6b1c4a541501..485bb9b03573af9c2eff3d2582e6d7338d884b09 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,12 @@ grub2 (1.94-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Fix powerpc building. Closes: #370259
+    - 01_fix_grub-install.patch: merged upstream.
   * Leave CDBS set debhelper compatibility level.
   * Allow amd64 build to happen. Closes: #364956
   * Enforce building in 32bits while running in x86_64 machines.
   * Update Standards version to 3.7.2. No changes need.
+  * 
 
  -- Otavio Salvador <otavio@debian.org>  Mon,  5 Jun 2006 11:48:03 -0300
 

diff --git a/debian/patches/01_fix_grub-install.patch b/debian/patches/01_fix_grub-install.patch
deleted file mode 100644 (file)
index b3960a8..0000000
--- a/debian/patches/01_fix_grub-install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur grub2-1.92/util/i386/pc/grub-install.in grub2-1.92.new/util/i386/pc/grub-install.in
---- grub2-1.92/util/i386/pc/grub-install.in    2005-08-07 14:02:35.000000000 -0300
-+++ grub2-1.92.new/util/i386/pc/grub-install.in        2006-01-06 09:46:07.730083392 -0200
-@@ -20,6 +20,7 @@
- # Initialize some variables.
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-+bindir=@bindir@
- sbindir=@sbindir@
- datadir=@datadir@
- PACKAGE_NAME=@PACKAGE_NAME@
-@@ -31,7 +32,7 @@
- pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
- 
- grub_setup=${sbindir}/grub-setup
--grub_mkimage=${sbindir}/grub-mkimage
-+grub_mkimage=${bindir}/grub-mkimage
- grub_mkdevicemap=${sbindir}/grub-mkdevicemap
- grub_probefs=${sbindir}/grub-probefs
- rootdir=