Comment 15 for bug 537900

Steve Langasek wrote:
> On Mon, Mar 22, 2010 at 11:30:17AM -0000, Axel Beckert wrote:
> > Steve Langasek wrote:
> > > Is there a summary available of the upstream changes (in particular, any
> > > changes that aren't straightforward bugfixes)?
> >
> > Since the current package is from more than one year ago, there surely
> > are.
>
> Right, but can you tell me what those are?

Attached the git log between those two Debian package releases (tagged
debian-0.9--git090223-1 and debian-0.9.1+git100220-1 in the git repo).
You can also read the git log online at
http://repo.or.cz/w/conkeror.git/shortlog, but I find the plain text
version easier to read. Breaking Changes are documented in the wiki at
http://conkeror.org/BreakingChanges anyway. But this does not include
all non-bugfix changes.

If necessary, I can try to summarise what changes are neither bugfixes
nor relevant for the package (like the scripts for the nightly
builds).

> > > If there are non-bugfix changes here, why do these warrant a freeze
> > > exception?
> >
> > The main reason is that the package was out of sync with Debian for a
> > while because it didn't work anymore with Ubuntu's xulrunner (which
> > doesn't allow xulrunner-stub to be symlinked) and hasn't been synced
> > anymore after that problem has been fixed in Debian in January.
>
> OTOH, you've also pointed out the two commits you care about;

Three things actually, of which I can pinpoint only two to
commits:

  + Debian package supports Ubuntu again
    (http://repo.or.cz/w/conkeror.git/commitdiff/e6faed1dbbc896ca2023e9b793348be3e452975d)
  + Debian package supports xulrunner-1.9.2
    (http://repo.or.cz/w/conkeror.git/commitdiff/cbc2e88fe750160adad66d8f8648493856e78c88
    and http://repo.or.cz/w/conkeror.git/commitdiff/8d11dbc5f3c49e9bca0ba8512f79aaa0b2c56f03)
  + Upstream tested with xulrunner 1.9.2 (not a single commit, but
    the knowledge, that upstream never tested the version currently in
    Ubuntu with xulrunner 1.9.2)

The first two are easy to cherry pick. The last one is not.

  Regards, Axel
--
 ,''`. | Axel Beckert <email address hidden>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
  `- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5