Nathan, Thanks for the explanation. I understand those two cases. What I don't know is whether keeping an existing kubuntu patch needs to be re-entered in the changelog if it is already there from an earlier version. I've attached the debian/changelog to illustrate. After the MoM conflicts have been resolved the remaining delta is two kubuntu patches:
kubuntu_01_kcm_systemsettings.diff kubuntu_02_confchanges.diff As far as I can tell neither have these have gone upstream or been fixed in the source (based on the changelog). The addition of these two patches is already recorded in the changelog when they were originally added. So, should I be adding a line that says something like: "retained Kubuntu patch1 and Kubuntu patch2" ** Attachment added: "changelog" http://launchpadlibrarian.net/14910570/changelog -- merge kdmtheme 1.2.2-1 from Debian unstable https://bugs.launchpad.net/bugs/227912 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
