fetchmail
Tue Oct  7 19:10:19 2008

Below now follows the report of the automated merge of the Ubuntu
changes to the fetchmail source package against the new Debian
version.

This file is designed to be both human readable and machine-parseable.
Any line beginning with four spaces is a file that should be
downloaded for the complete merge set.


Here are the particulars of the three versions of fetchmail that were
chosen for the merge.  The base is the newest version that is a common
ancestor of both the Ubuntu and Debian packages.  It may be of a
different upstream version, but that's not usually a problem.

The files are the source package itself, and the patch from the common
base to that version.

base: 6.3.8-11
    fetchmail_6.3.8-11.dsc
    fetchmail_6.3.8.orig.tar.gz
    fetchmail_6.3.8-11.diff.gz

ubuntu: 6.3.8-11ubuntu2
    fetchmail_6.3.8-11ubuntu2.dsc
    fetchmail_6.3.8.orig.tar.gz
    fetchmail_6.3.8-11ubuntu2.diff.gz

base -> ubuntu
    fetchmail_6.3.8-11ubuntu2.patch

debian: 6.3.9~rc2-3
    fetchmail_6.3.9~rc2-3.dsc
    fetchmail_6.3.9~rc2.orig.tar.gz
    fetchmail_6.3.9~rc2-3.diff.gz

base -> debian
    fetchmail_6.3.9~rc2-3.patch


Generated Result
================

No problems were encountered during the merge, so a source package has
been produced along with a patch containing the differences from the
Debian version to the new version.

You should compare the generated patch against the patch for the
Ubuntu version given above and ensure that there are no unexpected
changes.  You should also sanity check the source package.

generated: 6.3.9~rc2-3ubuntu1
    fetchmail_6.3.9~rc2-3ubuntu1.dsc
    fetchmail_6.3.9~rc2.orig.tar.gz
    fetchmail_6.3.9~rc2-3ubuntu1.diff.gz

debian -> generated
    fetchmail_6.3.9~rc2-3ubuntu1.patch


Once you have a source package you are happy to upload, you should
make sure you include the orig.tar.gz if appropriate and information
about all the versions included in the merge.

Use the following command to generate a correct .changes file:

  $ dpkg-genchanges -S -v6.3.8-11ubuntu2 -sa