[Merge] lp:~grishkin/chm2pdf/chm2pdf_branch into lp:~reto-knaak/chm2pdf/chm2pdf_branch

[Grishkin]

Hi Reto!
I've reviewed your branch at
https://code.launchpad.net/~reto-knaak/chm2pdf/chm2pdf_branch and it seems
that it does not contain any of patches you mentioned, just changes in
changelog file. So I've merged these patches to my branch manually. I did
not test them deeply still and I am not especially confident in correctness
of merge of the latter two patches.
Seems that I've found the solution to the problem you've described at
https://bugs.launchpad.net/ubuntu/+source/chm2pdf/+bug/894193 - check the
latest comment there.
To merge the branches you'll have to install bzr somewhere on your local PC
and download your branch (if it is not already present there) by running:
bzr branch lp:~reto-knaak/chm2pdf/chm2pdf_branch
After that you merge branches by running:
bzr merge lp:~grishkin/chm2pdf/chm2pdf_branch
And upload the results back to launchpad:
bzr push lp:~reto-knaak/chm2pdf/chm2pdf_branch

Please feel free to contact me if you have any questions or if something is
not working.

-----
Best regards,
Grishkin Maxim



2012/10/24 Reto Knaak <reto.knaak at gmail.com>

> Hi Max!
>
> You're welcome and thank you!
> It's true that the project is abandoned... for me a pity because it does a
> wonderful job for me!
> Thank you for pointing out to me my replies are public, this is ok for me
> (I guessed it).
>
> I think it's a good idea to share your patch, and i suggest also to add the
> bug officially (with a link to the google code bug page).
> I also agree to merge the branches, but I'll need some help...
>
> In the mean time I updated my ubuntu system and tried your chm eample file,
> and  as expected an error occured....
>
> I started from the ubuntu version, and made my brach using this sequence:
>
> patch chm2pdf < ../patches/chm2pdf_check_soup.diff
> patch chm2pdf < ../patches/chm2pdf_no_javascript.diff
> patch chm2pdf < ../patches/chm2pdf_multiple_page_problem.diff
> patch chm2pdf < ../patches/chm2pdf_color_removed.diff
> patch chm2pdf < ../patches/chm2pdf_links_case_insensitive.diff
> patch chm2pdf < ../patches/chm2pdf_images_case_insensitive.diff
> patch chm2pdf < ../patches/chm2pdf_specialchars.diff
>
> Probably you need to appy all the patches.
>
> Maybe it's also a good idea if you give a critical look at my patches,
> chm2pdf is my first and only experience with python (and linux) and some of
> my solutions may not be too clean...
>
> Kind regards
> Reto
>
> --
> https://code.launchpad.net/~grishkin/chm2pdf/chm2pdf_branch/+merge/128385<https://code.launchpad.net/%7Egrishkin/chm2pdf/chm2pdf_branch/+merge/128385>
> You are the owner of lp:~grishkin/chm2pdf/chm2pdf_branch.
>

-- 
https://code.launchpad.net/~grishkin/chm2pdf/chm2pdf_branch/+merge/128385
Your team Ubuntu Sponsors Team is subscribed to branch lp:~reto-knaak/chm2pdf/chm2pdf_branch.