[Pkg-acpi-devel] git conflicts

[Loïc Minier]

On Wed, Sep 24, 2008, Michael Meskes wrote:
> apparently we were working on the archive at exactly the same time. I merged
> the changes, however, I undid some of yours. There is a reason for not using
> the Ubuntu directory unconditionally. Could you please have a look at my
> changes and tell me if this is okay with you?

 I stand by the argumentation I outlined shortly in my changelog entry:
 checking for /ubuntu/acpi in the kernel modules dir is simple, safe,
 efficient, maintainable, and allows people to run an Ubuntu kernel
 under Debian.  I really see no risk in including modules from
 /ubuntu/acpi unconditionally.

 I'll merge this back and revert build time generation which only makes
 thing more complex to maintain for no good reason.

 (BTW the current Ubuntu kernels have no /ubuntu/acpi on my system, but
 I didn't check the closed source modules part.)


 Too bad you uploaded before pushing as I had started refactoring the
 init script.   :-/

-- 
Loïc Minier