[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low [ Sergey Rudchenko ] * Merge from debian unstable, remaining changes: * kubuntu_02_confchanges.diff. Patch from Stefan Skotte * kubuntu_01_kcm_systemsettings.diff - kcm module inclusion in the Appearance section [ Harald Sitter ] * Remove Homepage from long description -- Harald Sitter [EMAIL PROTECTED] Fri, 06 Jun 2008 00:46:45 +0200 ** Changed in: kdmtheme (Ubuntu) Status: Fix Committed = Fix Released -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
** Changed in: kdmtheme (Ubuntu) Assignee: Richard Birnie (rbirnie) = Sergey Rudchenko (sergey.rudchenko) -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
** Changed in: kdmtheme (Ubuntu) Status: Incomplete = Fix Committed -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
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
Re: [Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
Richard, If the patch was added in Ubuntu in a previous version, the patch is still needed, and the patch has not been added upstream, then yes, you need to document it in your merge entry in debian/changelog. Usually, I just copy word-for-word the the bullet for when the patch was originally added. So for example, if 10_kdmtheme-override-warning.diff is still safe to remove (it was removed in kdmtheme 1.2.2-0ubuntu1 but still looks like it exists in Debian), you would add a bullet to your merge entry saying Removed 10_kdmtheme-override-warning.diff. (Notice I just copied and pasted?). I haven't actually looked through kdmtheme/attempted to perform the merge. I am not sure if the change of removing 10_kdmtheme-override-warning.diff can be kept or if it should be dropped. As the person performing the merge, you should try and find out why it was the patch was removed in Ubuntu, and why it is still present in Debian. Nathan On Mon, 2008-06-02 at 17:58 +, Richard Birnie wrote: 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 -- Nathan Handler [EMAIL PROTECTED] ** Attachment added: unnamed http://launchpadlibrarian.net/14930702/unnamed -- 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
Re: [Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
On Sat, May 31, 2008 at 4:25 PM, Nathan Handler [EMAIL PROTECTED] wrote: Ok, I still don't think this debdiff is ready to be uploaded. There are numerous issues with it. I'll start with debian/changelog. Intrepid Ibex is the current development release. This means that the first line in your changelog entry should be: kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low (Replace hardy with intrepid) Fair Enough Also, do you notice how this line, Merge from debian unstable, remaining changes: ends with a colon (:)? You are meant to list the Ubuntu changes that need to be kept. You only list the Ubuntu changes that are still needed, and that have not been added upstream. I don't see the distinction here. 'Ubuntu changes that need to be kept' versus 'Ubuntu changes that are still needed' sounds like exactly the same thing to me. Can you expand on this please Also, when you have a completed debdiff for a merge, you should un- assign yourself (https://wiki.ubuntu.com/UbuntuDevelopment/Merging#head- 631d8d195a6aa6c7e64a9dbca5a7b004e4a0eb40https://wiki.ubuntu.com/UbuntuDevelopment/Merging#head-631d8d195a6aa6c7e64a9dbca5a7b004e4a0eb40 ). Oops, minor oversight. easily fixed ** Changed in: kdmtheme (Ubuntu) Status: Confirmed = Incomplete -- merge kdmtheme 1.2.2-1 from Debian unstable https://bugs.launchpad.net/bugs/227912 You received this bug notification because you are a direct subscriber of the bug. ** Attachment added: unnamed http://launchpadlibrarian.net/14876096/unnamed -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
I'll try my best to elaborate about the changelog. It took me a while to fully understand what needs to go there as well. I'll use various examples to try and make this as clear as possible. Example 1: Bob, an Ubuntu developer adds a patch to the debian/patches folder for package X version 1.3.3.7-2ubuntu1. His patch corrects a spelling error in part of the program. Somewhere upstream (either Debian or the application's developer), they also notice the spelling error. If Debian decides to fix it, they will most likely add Bob's patch to 1.3.3.7-3 (the new Debian version of the package). This means that Bob's change (adding the patch) is no longer needed (since the patch was added upstream). As a result, when it comes time to merge (or sync) package X version 1.3.3.7-3 from Debian, Bob's change would NOT be listed under Merge from debian unstable, remaining changes: . Now, if the original developer of the application sees the error, he/she will correct it in the actual source code (without using a patch). This means that Debian's new version of the package, 1.3.3.8-1 (Notice the .8, this shows that it is a new upstream version) would not need the patch. Also, if Ubuntu were to merge (or sync) the package from Debian, we would also not need the patch. As a result, there would be no need to list Bob's change of adding the patch in the Merge changelog entry. Example2: Joe adds a .desktop file (what you see under the Applications menu) to package Y version 1.2.3-4ubuntu1. Eventually, Debian releases a new version of Y, 1.2.3-5. The new Debian version does not include Joe's .desktop file. This change is significant enough, so it can't be dropped in order to do a sync. When performing the merge for 1.2.3-5, you would get any changes made by Debian, along with the addition of Joe's .desktop file. Since Joe's change is still being included in this new version, 1.2.3-5ubuntu1, you would need to list it under the merge entry in the changelog. Hopefully those examples helped explain what changes you need to list in the changelog when doing a merge. -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
Ok, I still don't think this debdiff is ready to be uploaded. There are numerous issues with it. I'll start with debian/changelog. Intrepid Ibex is the current development release. This means that the first line in your changelog entry should be: kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low (Replace hardy with intrepid) Also, do you notice how this line, Merge from debian unstable, remaining changes: ends with a colon (:)? You are meant to list the Ubuntu changes that need to be kept. You only list the Ubuntu changes that are still needed, and that have not been added upstream. Also, when you have a completed debdiff for a merge, you should un- assign yourself (https://wiki.ubuntu.com/UbuntuDevelopment/Merging#head- 631d8d195a6aa6c7e64a9dbca5a7b004e4a0eb40). ** Changed in: kdmtheme (Ubuntu) Status: Confirmed = Incomplete -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
debian-ubuntu debdiff ** Attachment added: kdmtheme_debian.debdiff http://launchpadlibrarian.net/14861355/kdmtheme_debian.debdiff ** Changed in: kdmtheme (Ubuntu) Status: In Progress = Confirmed -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
ubuntu-ubuntu debdiff ** Attachment added: kdmtheme_ubuntu.debdiff http://launchpadlibrarian.net/14861341/kdmtheme_ubuntu.debdiff -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
Yes I am still working on this. Should have time to make a new debdiff this weekend. I expected it to be reassigned to me automatically when the previous diff was rejected ** Changed in: kdmtheme (Ubuntu) Assignee: (unassigned) = Richard Birnie (rbirnie) Status: Confirmed = In Progress -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
Richard, are you still working on this merge? If so, please assign yourself to it, and set it to In Progress. If not, please post here, and I or someone else will gladly take care of it. -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
The debdiff looks wrong. Can you attach an updated (for intrepid) Debian-Ubuntu debdiff? -- 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
[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable
** Attachment added: kdmtheme_1.2.2-1ubuntu1.debdiff http://launchpadlibrarian.net/14346701/kdmtheme_1.2.2-1ubuntu1.debdiff -- 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
