Accepted: xorg 1:7.3+4ubuntu1 (source)

[Timo Aaltonen]

On Fri, 16 Nov 2007, Colin Watson wrote:

> On Fri, Nov 16, 2007 at 03:28:03PM +0200, Timo Aaltonen wrote:
>> On Fri, 16 Nov 2007, Colin Watson wrote:
>>> This change drops all the previous Ubuntu changelog entries, and also
>>> doesn't fit the usual pattern for Ubuntu merges from Debian, which is
>>> something like this:
>>>
>>>  * Resynchronise with Debian. Remaining changes:
>>>    - foo
>>>    - bar
>>>    - baz
>>
>> That was due to me not doing the right thing with git. This package, along
>> with xorg-server, is now maintained in git.debian.org, where they have a
>> separate branch named (enter drumroll) "ubuntu".
>
> Having these revision-controlled is definitely an improvement; although
> since changelog entries are generally typed by hand I'm not sure how the
> revision control system matters here. Or was that changelog generated
> automatically?

Yes and no, since the changelog entried from previous commits are already 
there, but the conflicts need to be sorted out by hand. The merge-header 
can be added at the same time, or as a final commit before uploading.


t