Re: Diff against original mozilla code

[Mike Hommey]

On Wed, Nov 22, 2006 at 01:13:16PM -0600, Karl Berry <address@hidden> wrote:
>     as> Can we find common ground on whether its ok to ship "forked"
>     mozillas or not? 
> 
> Why not?  Isn't that what we're working towards?
> Or are you saying you don't want to?  I don't understand ...
> 
>     as> However, I would really like to see those changes being done
>     in a fashion which allows downstream-distributors to switch them off
>     (e.g. by configure switch).
> 
>     mh> I was actually thinking about evaluating how possible it was to make
>     the iceweasel differences an extension to firefox.  Which would be
>     much easier to integrate afterwards in the build system.
> 
> configure switch vs. extension vs. whatever is ok by me, but it's up to
> Giuseppe as far as GNU Gnuzilla goes.
> 
> Part of the goal of those new features was to give people a reason to
> *use* (free) iceweasel instead of (nonfree) firefox.  So we would like
> them to be enabled by default, as you (Alexander) suggested.

Making these extensions-like don't prevent it to be enabled by default.
But it would improve maintainability. From the glance I took to the diff
Giuseppe sent me, there are obvious problems with the way it is handled
now... it looks like some of the files stayed at the 1.5.0.5 level and
didn't get the 1.5.0.7 changes merged... I'll post more comments on this
diff later this week or the next.

> Meanwhile, I'd like to repeat my question from a couple days ago,
> because the answer will help me understand the current situation more
> clearly -- do you (Debian) have a source repository where you have been
> making separate patches?  That is, have you made changes that we should
> re-import into ours?

Not really. The repositories are (for now) private, though iceape
(seamonkey) should be made public soon.
You can take a look at the .diff.gz files from firefox/iceweasel,
thunderbird/icedove, and xulrunner to see what patches have been applied
to our trees. Note that firefox/iceweasel has patches applied directly,
while the others have a set of patches in the debian/patches directory,
which helps keeping track of the patches.

I posted an overview of the patches we apply to firefox when I got
pissed by the MoCo FUD about these patches on my blog:
http://web.glandium.org/blog/?p=99

Cheers

Mike