[Bug 227912] Re: merge kdmtheme 1.2.2-1 from Debian unstable

[Nathan Handler]

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
Sponsors for universe, which is a direct subscriber.