Pledge to merger's

[Morten Kjeldgaard]

The merges that need to be carried out by hand often have a conflict because 
of different requirements on the Depends: lines in debian/control.

The automated patching can not resolve such conflicts if there are major 
changes in those lines.

To make it easier for software (and humans!) to understand what goes on in the 
merge, it is good to make sure that the Depends: control lines (and their 
friends Recommends: etc.) have as _few_ differences as possible.

Sometimes the Debian maintainer has switched around the order of things in the 
dependency line, and in such cases you should follow what has been done 
there, and not stick to the Ubuntu merge of the older version.

Also, if Ubuntu _adds_ packages to the dependency fields, it is good to add 
them on a separate line. This increases the likelyhood that the merge can be 
performed seamlessly, and it is immediately clear to the sponsor what is 
going on.

Cheers, and keep up the good work!

Morten (mok0)