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

[Nathan Handler]

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 +0000, 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 <nathan.handler at gmail.com>


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