https-everywhere Mon Nov 28 04:41:22 2011 Below now follows the report of the automated merge of the Ubuntu changes to the https-everywhere 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 https-everywhere 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: 1.0.3-1 https-everywhere_1.0.3-1.dsc https-everywhere_1.0.3.orig.tar.bz2 https-everywhere_1.0.3-1.debian.tar.gz ubuntu: 1.0.3-1ubuntu1 https-everywhere_1.0.3-1ubuntu1.dsc https-everywhere_1.0.3.orig.tar.bz2 https-everywhere_1.0.3-1ubuntu1.debian.tar.gz base -> ubuntu https-everywhere_1.0.3-1ubuntu1.patch debian: 1.2-2 https-everywhere_1.2-2.dsc https-everywhere_1.2.orig.tar.bz2 https-everywhere_1.2-2.debian.tar.gz base -> debian https-everywhere_1.2-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. https-everywhere_1.2-2ubuntu1.src.tar.gz 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 -v1.0.3-1ubuntu1 -sa