webkitgtk_2.4.5-2_all.changes ACCEPTED into unstable

[Emilio Pozuelo Monfort]

On 06/09/14 14:31, Alberto Garcia wrote:
> On Sat, Sep 06, 2014 at 11:34:01AM +0000, Debian FTP Masters wrote:
> 
>>  webkitgtk (2.4.5-2) unstable; urgency=medium
>>  .
>>    * debian/control:
>>      + Rebuild against new cairo without cairo-gl/egl. Closes: #760593.
> 
> You didn't rebase on top of the existing changes, did you? We have an
> unnecessary merge in the branch now... nothing too serious, though,
> but how about I fix it and overwrite the current tip of the unstable
> branch?

I forgot to pull before making my changes, and by the time I tried to push them
to the git repo, I had already uploaded my changes to the archive. Otherwise I
would have rebased them and included your changes in my upload. So the only way
I saw out of that without rewriting history was to merge both branches, which I
think is correct. But I don't mind if you rewrite the history to avoid the
merge, although I don't know if there are many users that could be affected (but
probably there aren't).

Cheers,
Emilio