Having looked at the delta:
* Debian maintainer has switched to openjdk, so we don't need to carry that.
* debian/rules rewrite to avoid carrying build.patch -> Considered too costly to carry for the delta (ack'd with orig author)
* Browser Recommends, it's for the -docs package (lower priority), and DM has swtiched to iceweasel | firefox | www-browser. This means that for Maverick, all desktop systems will satisfy the Recommends already (and Iceweasel wouldn't get installed).
Having looked at the delta:
* Debian maintainer has switched to openjdk, so we don't need to carry that.
* debian/rules rewrite to avoid carrying build.patch -> Considered too costly to carry for the delta (ack'd with orig author)
* Browser Recommends, it's for the -docs package (lower priority), and DM has swtiched to iceweasel | firefox | www-browser. This means that for Maverick, all desktop systems will satisfy the Recommends already (and Iceweasel wouldn't get installed).
Changing to SYNC rather than MERGE.