Conflict Report:
================
gdb
Sat May 13 15:44:04 2023
Below now follows the report of the automated merge of the Ubuntu
changes to the gdb 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 gdb 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: 13.1-2
gdb_13.1-2.dsc
gdb_13.1.orig.tar.xz
gdb_13.1.orig.tar.xz.asc
gdb_13.1-2.debian.tar.xz
ubuntu: 13.1-2ubuntu2
gdb_13.1-2ubuntu2.dsc
gdb_13.1.orig.tar.xz
gdb_13.1-2ubuntu2.debian.tar.xz
base -> ubuntu
gdb_13.1-2ubuntu2.patch
debian: 13.1-3
gdb_13.1-3.dsc
gdb_13.1.orig.tar.xz
gdb_13.1.orig.tar.xz.asc
gdb_13.1-3.debian.tar.xz
base -> debian
gdb_13.1-3.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.
gdb_13.1-3ubuntu1.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/patches/series
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 -v13.1-2ubuntu2
** Changed in: gdb (Ubuntu)
Assignee: (unassigned) => Dominik Viererbe (dviererbe)
** Changed in: gdb (Ubuntu)
Status: New => In Progress
--
You received this bug notification because you are a member of Ubuntu
Touch seeded packages, which is subscribed to gdb in Ubuntu.
https://bugs.launchpad.net/bugs/2023016
Title:
Merge 13.1-3 into mantic
Status in gdb package in Ubuntu:
In Progress
Bug description:
The upstream version 13.1-3 should be merged into mantic. The current
version is 13.1-2ubuntu2.
See the merge conflict report: https://merges.ubuntu.com/g/gdb/REPORT
Note: this is a tracking bug
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/gdb/+bug/2023016/+subscriptions
--
Mailing list: https://launchpad.net/~touch-packages
Post to : touch-packages@lists.launchpad.net
Unsubscribe : https://launchpad.net/~touch-packages
More help : https://help.launchpad.net/ListHelp
