]> git.proxmox.com Git - zfsonlinux.git/commitdiff
Make patches unfuzzy
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Fri, 15 Apr 2016 09:02:48 +0000 (11:02 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Fri, 15 Apr 2016 09:06:44 +0000 (11:06 +0200)
zfs-patches/fix-control.patch
zfs-patches/skip-unneeded-pull-requests.patch

index b7c36933a60193b9c033d6b29bd225ef25c288ce..b9307c1ff0664f1b17a1d1e33c50c91425e7f3ef 100644 (file)
@@ -149,4 +149,4 @@ Index: new/debian/rules
 -
  override_dh_installinit:
        @# Install systemd files
-       dh_systemd_enable -pzfsutils etc/systemd/system/zfs.target
+       dh_systemd_enable -pzfsutils contrib/systemd/system/zfs.target
index 34fcd1c98a66330438024d1b41c23d0aa1549e79..62f56400bb65ad7e9f4153b1db7e79da0a97fc78 100644 (file)
@@ -2,7 +2,7 @@ diff --git a/debian/patches/series b/debian/patches/series
 index ffafe6c..9823273 100644
 --- a/debian/patches/series
 +++ b/debian/patches/series
-@@ -1,13 +1,13 @@
+@@ -1,12 +1,12 @@
  0002-Prevent-manual-builds-in-the-DKMS-source.patch
  0005-Remove-userland-dist-rules.patch
  libzfs-dependencies
@@ -18,4 +18,4 @@ index ffafe6c..9823273 100644
 +#PR3238.patch
  PR3465.patch
  PR3559.patch
- PR3884.patch
+ PR3560.patch