Nice job: it's a complex merge, and it seems to be done very well.
I only have some comments on the debdiff:
- why do you delete part of the patch iceape-dev.dpatch ? You don't apply it after, so it could stay as-is
- instead of duplicating almost the full content of the patch iceape-dev.dpatch, I would have made a smaller patch on the top of this patch
- there are 2 translation files in your debdiff. They shouldn't be there
Nice job: it's a complex merge, and it seems to be done very well.
I only have some comments on the debdiff:
- why do you delete part of the patch iceape-dev.dpatch ? You don't apply it after, so it could stay as-is
- instead of duplicating almost the full content of the patch iceape-dev.dpatch, I would have made a smaller patch on the top of this patch
- there are 2 translation files in your debdiff. They shouldn't be there
Otherwise, looks good.
Thanks to fix those small issues.
Fabrice