nm-tray Tue Sep 5 22:01:49 2023 Below now follows the report of the automated merge of the Ubuntu changes to the nm-tray 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 nm-tray 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: 0.4.3-2 nm-tray_0.4.3-2.dsc nm-tray_0.4.3.orig.tar.xz nm-tray_0.4.3-2.debian.tar.xz ubuntu: 0.5.0-0ubuntu1 nm-tray_0.5.0-0ubuntu1.dsc nm-tray_0.5.0.orig.tar.gz nm-tray_0.5.0-0ubuntu1.debian.tar.xz debian: 0.5.0-2 nm-tray_0.5.0-2.dsc nm-tray_0.5.0.orig.tar.gz nm-tray_0.5.0-2.debian.tar.xz base -> debian nm-tray_0.5.0-2.patch Generated Result ================ Due to conflict or error, it was not possible to automatically create a source package. Instead the result of the merge has been placed into the following tar file which you will need to turn into a source package once the problems have been resolved. nm-tray_0.5.0-2ubuntu1.src.tar.gz Conflicts ========= In one or more cases, there were different changes made in both Ubuntu and Debian to the same file; these are known as conflicts. It is not possible for these to be automatically resolved, so this source needs human attention. Those files marked with 'C ' contain diff3 conflict markers, which can be resolved using the text editor of your choice. Those marked with 'C*' could not be merged that way, so you will find .UBUNTU and .DEBIAN files instead and should choose one of them or a combination of both, moving it to the real filename and deleting the other. C debian/control C debian/patches/series C debian/rules Once you have a source package you are happy to upload, you should make sure you include the orig.tar.* 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 -v0.5.0-0ubuntu1