[Pkg-acpi-devel] git conflicts

[Michael Meskes]

On Wed, Sep 24, 2008 at 01:27:02PM +0200, Loïc Minier wrote:
>  I'll merge this back and revert build time generation which only makes
>  thing more complex to maintain for no good reason.

I stand by my own argumentation that there is a good reason. :-)

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

Which is exactly what I'm worried about. It's not the kernel package itself,
but the closed source add-ons. But given al the hassle this has created I'm
willing to back off. :-)
 
>  Too bad you uploaded before pushing as I had started refactoring the
>  init script.   :-/

Sorry 'bout that. I did pull before doing that work, was a first time for me as
well. Never had this happen before.

Michael
-- 
Michael Meskes
Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org)
Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org
ICQ: 179140304, AIM/Yahoo: michaelmeskes, Jabber: meskes at jabber.org
Go VfL Borussia! Go SF 49ers! Use Debian GNU/Linux! Use PostgreSQL!