use latest packages from githup (2.02-beta2.9-ZOL11-7aa9f6)

[zfs-grub.git] / pvepatches / fix-control.patch

diff --git a/pvepatches/fix-control.patch b/pvepatches/fix-control.patch
index df78ea8d007506a938b5a703b565ba177b505d65..1b3f95e27003865a16eeb459f8f5cb164e3ad5e4 100644 (file)
--- a/pvepatches/fix-control.patch
+++ b/pvepatches/fix-control.patch
@@ -1,21 +1,12 @@
 Index: new/debian/control
 ===================================================================
---- new.orig/debian/control    2014-12-22 12:55:53.000000000 +0100
-+++ new/debian/control 2015-01-13 06:30:52.000000000 +0100
-@@ -24,7 +24,6 @@
+--- new.orig/debian/control    2015-04-11 09:20:22.000000000 +0200
++++ new/debian/control 2015-04-12 10:38:15.000000000 +0200
+@@ -27,7 +27,6 @@
   libgeom-dev (>= 8.2+ds1-1) [kfreebsd-any] | libgeom-dev (<< 8.2) [kfreebsd-any],
   libsdl1.2-dev [!hurd-any],
   xorriso (>= 0.5.6.pl00),
 - qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
-  cpio [i386 kopensolaris-i386 amd64 x32],
+  cpio [i386 kopensolaris-i386 amd64],
   parted [!hurd-any],
   libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
-@@ -35,7 +34,7 @@
-  wamerican,
-  libxen-dev [i386 amd64],
-  libparted-dev [any-ppc64el],
--Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
-+Build-Conflicts: autoconf2.13
- Standards-Version: 3.8.4
- Homepage: http://www.gnu.org/software/grub/
- Vcs-Git: git://anonscm.debian.org/pkg-grub/grub.git