[Pkg-zfsonlinux-devel] Merge request #1 on SPL and ZFS repositories

[Aron Xu]

Hi,

On Thu, Feb 21, 2013 at 11:13 AM, Carlos Alberto Lopez Perez
<clopez at igalia.com> wrote:
> Hi!
>
> And here is my first merge request.
>
> I have committed some fixes on the branch clopez of both repositories [1]
>
> Here is the oneline summary:
>
> spl (clopez) $ git log --oneline master..clopez
> 16b165c Explicity select what is copied inside the DKMS source tree
> cc2a392 Use dh --with dkms
> 489c31a Use $(MAKE) instead of make:
>

Good work, this has been merged.

>
> zfs (clopez) $ git log --oneline master..clopez
> 7756d2f Remove patches that were used to clean manually the DKMS source tree.
> e6fd8d0 Explicity select what is copied inside the DKMS source tree
> fbc1bfe Prevent fatal error on zfs-dkms.postinst when update-notifier-common is not installed
> 2d5cb86 Add missing lsb-release dependency to Build-Depends and zfs-dkms:Depends
> f61f5be dh_installinit rules should be inside override_dh_installinit target
> 505714c Use dh --with dkms
> 661c4a4 Use $(MAKE) instead of make:
>

Merged with trivial modification, as you changed a "makefile" in
comment to "$(MAKE)file", I bet it's a sed mistake.




-- 
Regards,
Aron Xu