This looks mostly ok but the merge doesn't seem to account for the apport hooks being in debian now -- the changelog still lists it as a difference, the package-hooks dir is in the .dirs files twice, and I think they might be installed twice.
This looks mostly ok but the merge doesn't seem to account for the apport hooks being in debian now -- the changelog still lists it as a difference, the package-hooks dir is in the .dirs files twice, and I think they might be installed twice.