Bug#568168: xserver-xorg-video-nouveau needs nouveau bits from libdrm
On 2010-03-24 09:20 +0100, Julien Cristau wrote:
> On Tue, Mar 23, 2010 at 22:19:20 +0100, Sven Joachim wrote:
>
>> I'm not sure how to do the merge. While merging upstream-ubuntu into
>> upstream-experimental is a trivial fast-forward, and merging
>> upstream-experimental into debian-experimental is also a no-brainer,
>> merging ubuntu into debian-experimental resulted in quite a few things
>> that needed to be backed out; for instance their patch 02_nouveau_bgnr
>> leads to FTBFS on Debian, and I'm not sure you want all the Ubuntu
>> history in debian/changelog either.
>>
>> So it might be better to "merge --squash" that branch, since otherwise
>> we might create problems for Ubuntu (in their later merges) if we revert
>> many of their actions. What do you think?
>>
> I think I'd just apply the relevant parts of the ubuntu diff manually
> instead of doing it as a git merge. Hopefully that won't be too hard to
> extract, and that way we don't import the unrelated changes you mention.
> merge --squash and revert the changes we don't want before committing
> looks like would do that (I didn't know about merge --squash, thanks for
> the pointer!).
I've done that, cherry-picking one of their commits (xsfbs update)
before squash-merging. What was left after reverting were basically
only changes to debian/control, I split these into several commits.
The results can be seen here:
git://git.debian.org/users/joachim-guest/xserver-xorg-video-nouveau.git
http://git.debian.org/?p=users/joachim-guest/xserver-xorg-video-nouveau.git
There are some rough edges left:
- We need something like Ubuntu's 01_include_snapshot_date patch to
ensure that NV_DRIVER_DATE is set to something meaningful when
building outside the Git repository. NV_DRIVER_DATE is only used to
print the driver date into Xorg's log file, so setting it to the empty
string is not the end of the world, but still not nice.
- Shipping an upstream changelog would be useful (could probably be
achieved with a suitable invocation of "git log").
- There are 132 warnings from dpkg-shlibdeps about unresolvable
references in nouveau_drv.so.
But overall, the package already works quite okay. I have yet to test
it with a Debian kernel, though (running self-compiled 2.6.33.1 ATM).
Sven
Reply to: