Please fix your merge so that changes remaining as a delta from Debian are listed: this helps reviewing whether those are still needed later when proceeding with another merge, or deciding if it should be a sync instead.
You can check the delta from Debian within a Ubuntu packaging branch using: bzr diff --old debianlp:sid/aiccu
Please fix your merge so that changes remaining as a delta from Debian are listed: this helps reviewing whether those are still needed later when proceeding with another merge, or deciding if it should be a sync instead.
You can check the delta from Debian within a Ubuntu packaging branch using: bzr diff --old debianlp:sid/aiccu