Comment 19 for bug 542994

El Viernes 11 Junio 2010, Jaap Karssenberg escribió:
> On Thu, Jun 10, 2010 at 6:09 PM, maacruz <email address hidden> wrote:
> > Updated patch for 0.47
> >
> > ** Patch added: "Patch against 0.47"
> >   http://launchpadlibrarian.net/50080137/zim-0.47-maemo.patch
>
> I see this is still the patch without my changes. Did you have a look at
> those?
>
No, Jaap, you are wrong :)
This is patch has all your changes (as in merge-maemo.patch)
with all my fixes upon them to make it work again (so a couple of changes may
seem reverted but they really aren't),
and all comments "FIXME: Why do you do this?" answered,
and then a few new platform enhancements and bugfixes (the main one being
better N900 support), as in mergev2-maemo.patch which is against your
pyzim-maemo branch (to make clear what my changes upon yours are),
and then applied to 0.47 and all the collisions that happened fixed, so it can
be used to directly merge with 0.47
Nothing less, nothing more.

Sorry if this sounds confusing.

So, to make it clear where each patch belongs to:
- mergev2-maemo.patch is against your pyzim-maemo branch, which is still 0.46
and deprecated by the 0.47 release
- zim-0.47-maemo.patch is against 0.47 release
Both hold the same changes.

--
Don't see the world through a window, be open{source}minded, and be free :-)