Refresh debian/patches after upstream merge.

diff --git a/debian/patches/0001-Use-bin-bash-to-invoke-dracut-scripts.patch b/debian/patches/0001-Use-bin-bash-to-invoke-dracut-scripts.patch
index 7e81ecacadb0b63010899f69c25ddc2d9951bb74..ad8302725057de7890a5f95c513fe23241433e93 100644 (file)
--- a/debian/patches/0001-Use-bin-bash-to-invoke-dracut-scripts.patch
+++ b/debian/patches/0001-Use-bin-bash-to-invoke-dracut-scripts.patch
@@ -14,8 +14,8 @@ dash builtin does not implement the hex format.
  dracut/90zfs/parse-zfs.sh.in    |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/dracut/90zfs/module-setup.sh.in b/dracut/90zfs/module-setup.sh.in
-index c01915e..a940cd9 100755
+Index: b/dracut/90zfs/module-setup.sh.in
+===================================================================
 --- a/dracut/90zfs/module-setup.sh.in
 +++ b/dracut/90zfs/module-setup.sh.in
 @@ -1,4 +1,4 @@
@@ -24,8 +24,8 @@ index c01915e..a940cd9 100755
  
  check() {
        # We depend on udev-rules being loaded
-diff --git a/dracut/90zfs/mount-zfs.sh.in b/dracut/90zfs/mount-zfs.sh.in
-index 2d2afd8..8bbc6c2 100755
+Index: b/dracut/90zfs/mount-zfs.sh.in
+===================================================================
 --- a/dracut/90zfs/mount-zfs.sh.in
 +++ b/dracut/90zfs/mount-zfs.sh.in
 @@ -1,4 +1,4 @@
@@ -34,8 +34,8 @@ index 2d2afd8..8bbc6c2 100755
  
  . /lib/dracut-lib.sh
  
-diff --git a/dracut/90zfs/parse-zfs.sh.in b/dracut/90zfs/parse-zfs.sh.in
-index 571d263..5bfb472 100755
+Index: b/dracut/90zfs/parse-zfs.sh.in
+===================================================================
 --- a/dracut/90zfs/parse-zfs.sh.in
 +++ b/dracut/90zfs/parse-zfs.sh.in
 @@ -1,4 +1,4 @@
@@ -44,6 +44,3 @@ index 571d263..5bfb472 100755
  
  . /lib/dracut-lib.sh
  
--- 
-1.7.5.4
-

diff --git a/debian/patches/disable-dist-scripts.patch b/debian/patches/disable-dist-scripts.patch
index 7225936c220d1aa07cc6dfda24ce21c38c87f05d..1964fff064c79924f32e428f152e6d90ffcd871e 100644 (file)
--- a/debian/patches/disable-dist-scripts.patch
+++ b/debian/patches/disable-dist-scripts.patch
@@ -25,7 +25,7 @@ Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -131,7 +131,7 @@
+@@ -132,7 +132,7 @@
        distdir dist dist-all distcheck
  ETAGS = etags
  CTAGS = ctags
@@ -34,7 +34,7 @@ Index: b/Makefile.in
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -338,7 +338,7 @@
+@@ -339,7 +339,7 @@
  top_srcdir = @top_srcdir@
  udevdir = @udevdir@
  udevruledir = @udevruledir@
@@ -47,7 +47,7 @@ Index: b/scripts/Makefile.in
 ===================================================================
 --- a/scripts/Makefile.in
 +++ b/scripts/Makefile.in
-@@ -331,7 +331,7 @@
+@@ -332,7 +332,7 @@
  top_srcdir = @top_srcdir@
  udevdir = @udevdir@
  udevruledir = @udevruledir@