On Tue, Dec 06, 2005 at 09:50:24AM +1100, Luke Yelavich wrote:
> Now i tryed to merge kvdr
> (https://launchpad.net/distros/ubuntu/+source/kvdr/+bug/5400), but
> ajmitch told me that it was not correct.
>
> I wish like to know what i have to do step by step and when a merge is
> infact a sync.
>
> 1. Assign your self
> 2. Get ubuntu and debian source
>
> Now what ?, i hope im not troubeling you guys with my questions i just
> want to help.
Hey, we can use every help we can get, because there is still an awful
lot of work to do.
The next steps to do:
3. Get the old debian source, on which the current ubuntu package is
based on.
4. Examine the changes which have been done to that old debian package.
All of these changes should be mentioned in the changelog.
4.1. If the changes are not longer necessary, then request a sync of
the new debian source. This is mainly because of the following reasons:
4.1.1 The ubuntu diff contains patches to get the package built in
ubuntu, and debian has merged all our changes, or the changes are no
longer necessary.
4.1.2 The ubuntu diff contains a security fix or other feature
enhancement, which debian has merged.
4.1.3 The ubuntu diff contains a update to a new upstream version,
and debian updated in the meantime, too.
4.2 If not all changes have been merged, then take the new debian
package, and apply all patches from the old ubuntu package which are
left. Now examine the debdiff between the new debian source and your
newly merged package. Try to get this debdiff to a minimum, to make the
next merging as easy as possible. We cannot accept debdiffs with
unecessary or avoidable changes. And yes, we really look at THIS debdiff
and review it. Please attach this debdiff to the malone bug.
5. Try to build the new package (either your merged package or the new
debian source) in a recent dapper chroot. Pbuilder is considered very
handy at this point.
6. Update the malone bug.
Now to your kvdr merge: Please recheck the debiff. It looks like
important parts of the debian/changelog were deleted. This is not what
we want, because we want to document the changes both debian and ubuntu
has done to the package.
I hope this list helps. Perhaps we can add these instructions to a wiki
page, after a language and spelling check ;)
regards,
Reinhard
--
Ubuntu-motu mailing list
[email protected]
http://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
