rtags Sat Jan 11 22:46:41 2020 Below now follows the report of the automated merge of the Ubuntu changes to the rtags 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 rtags 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: 2.34-1 rtags_2.34-1.dsc rtags_2.34.orig.tar.gz rtags_2.34-1.debian.tar.xz ubuntu: 2.34-1ubuntu2 rtags_2.34-1ubuntu2.dsc rtags_2.34.orig.tar.gz rtags_2.34-1ubuntu2.debian.tar.xz base -> ubuntu rtags_2.34-1ubuntu2.patch debian: 2.37-1 rtags_2.37-1.dsc rtags_2.37.orig.tar.gz rtags_2.37-1.debian.tar.xz base -> debian rtags_2.37-1.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. rtags_2.37-1ubuntu1.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 chose one of them or a combination of both, moving it to the real filename and deleting the other. C debian/patches/series 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 -v2.34-1ubuntu2 -sa