Merge 13.2-1 into mantic

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

The Merge was more complicated that anticipated, but I finally managed to merge it.
I locally built it and did some trivial testing. Everything seems fine.

The Merge can be downloaded here:
https://launchpad.net/~dviererbe/+archive/ubuntu/lp2023016-gdb-merge-mantic

This bug was fixed in the package gdb - 13.2-1ubuntu1

---------------
gdb (13.2-1ubuntu1) mantic; urgency=medium

  * Merge with Debian from unstable (LP: #2023016)
    - build from upstream tarball
    - debian/control:
      - removed gdb-minimal package
      - added gdb-doc package
      - added (build-)dependency libc6-dbg on armhf
      - exclude libsource-highlight-dev on i386
    - debian/control.in:
      - added (build-)dependency libc6-dbg on armhf
      - exclude libsource-highlight-dev on i386
    - debian/patches/series:
      - apply patches gdb-strings and ptrace-error-verbosity
    - debian/gdb.install & debian/gdbserver.install:
      - include manpages in binary packages
    - debian/rules:
      - skip tests on armhf, hanging on the buildds
      - configure with --disable-werror
      - disable configure with --disable-sim
      - clean gdb/doc/GDBvn.texi before build
      - show test summary after test run
      - disable man-page installation (moved to *.install files)

gdb (13.2-1) unstable; urgency=medium

  * New upstream release.
  * Drop debian/patches: included upstream.
    - fix-crash-in-inside_main_func.patch
    - aarch64-pauth-registers.patch

gdb (13.1-3) unstable; urgency=medium

  [ Emanuele Rocca ]
  * aarch64: add aarch64-pauth-registers.patch to check for valid inferior
    thread/regcache before reading pauth registers. (Closes: #1034611)

 -- Dominik Viererbe <email address hidden> Fri, 16 Jun 2023 14:42:38 +0300