Lintian Fixes - gdb

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/gdb lintian-fixes/main

Summary

Diff

diff --git a/debian/changelog b/debian/changelog
index 424f3c117..3360bc3e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdb (10.1-3) UNRELEASED; urgency=medium
+
+  * Merge upstream signing key files.
+  * Set upstream metadata fields: Repository.
+  * Drop transition for old debug package migration.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 12 May 2021 06:09:05 -0000
+
 gdb (10.1-2) unstable; urgency=high
 
   * Acknowledge past contributions from Matthias and Samuel.
diff --git a/debian/rules b/debian/rules
index b6fef8ca1..cb8f7e399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -450,7 +450,7 @@ endif
 	ln -s gdb debian/gdb-multiarch/usr/share/doc/gdb-multiarch
 
 	dh_dwz -a
-	dh_strip -pgdb$(TS) --dbgsym-migration='gdb-dbg (<< 7.12-1~)'
+	dh_strip -pgdb$(TS)
 	dh_strip -a -Ngdb$(TS)
 	dh_compress -a
 	dh_fixperms -a
diff --git a/debian/upstream-signing-key.pgp b/debian/upstream-signing-key.pgp
deleted file mode 100644
index a13e4b260..000000000
Binary files a/debian/upstream-signing-key.pgp and /dev/null differ
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000000000..9c17e3a6e
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+---
+Repository: git://sourceware.org/git/gdb.git
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 7db1200c9..ef0b20e45 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,5 +1,4 @@
------BEGIN PGP ARMORED FILE-----
-Comment: Use "gpg --dearmor" for unpacking
+-----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBENhPS0RBACoqcuAmCbDDjWxpxdGc6Jgc4IEselZDipRXC1gH8ahJ0Z5xs8Y
 b8oD/mp3RkE3vM9Q4GfhPTWmcqHonIYXZdn4//eZm20D7m2hAhIMrwBSSGA/EBZT
@@ -27,4 +26,4 @@ AScFcUkFflc7sk+3eWvxrw0Mj+7Brm+R3AMPVQWISQQYEQIACQUCQ2E9NgIbDAAK
 CRCS7bBL/zJc87q8AJ98YZ0C4dERrs3wdVCAu2lQjDg+vACeKigwTyMS8NQctwHH
 sbhLkW5Yfyk=
 =teew
------END PGP ARMORED FILE-----
+-----END PGP PUBLIC KEY BLOCK-----

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/6e/0afdcf19eb2a824f117ce8902531c44468922f.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/90/24fe79d6ac2e8f6d7316451484890aab00c352.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/ab/4f075fbc9c51da85f08a3d33cff777ea74e9d3.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/e3/1c979dc7fe1a4c7e6ecce4cab28be97e5ca7c5.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/f9/b3c52379195493c4c027b9e308942338440bde.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/02/e60b56d02cb9d8e2c23f1978dcc481a622b254.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/1d/cb1bd5bb6927835085b06eb74f72e3376cf784.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/3b/5268022768f556a5acad2fc527a11b978521a6.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c3/b6f78c8873fa6a0793745359808c0655200444.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/d2/55ff967cf84550ad626b59d24e78e8216ae584.debug

No differences were encountered between the control files of package gdb

Control files of package gdb-dbgsym: lines which differ (wdiff format)

  • Breaks: gdb-dbg (<< 7.12-1~)
  • Build-Ids: 02e60b56d02cb9d8e2c23f1978dcc481a622b254 6e0afdcf19eb2a824f117ce8902531c44468922f
  • Replaces: gdb-dbg (<< 7.12-1~)

No differences were encountered between the control files of package gdb-minimal

Control files of package gdb-minimal-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 3b5268022768f556a5acad2fc527a11b978521a6 ab4f075fbc9c51da85f08a3d33cff777ea74e9d3

No differences were encountered between the control files of package gdb-multiarch

Control files of package gdb-multiarch-dbgsym: lines which differ (wdiff format)

  • Build-Ids: d255ff967cf84550ad626b59d24e78e8216ae584 9024fe79d6ac2e8f6d7316451484890aab00c352

No differences were encountered between the control files of package gdb-source

No differences were encountered between the control files of package gdbserver

Control files of package gdbserver-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 1dcb1bd5bb6927835085b06eb74f72e3376cf784 c3b6f78c8873fa6a0793745359808c0655200444 e31c979dc7fe1a4c7e6ecce4cab28be97e5ca7c5 f9b3c52379195493c4c027b9e308942338440bde

Run locally

Try this locally (using the lintian-brush package):

debcheckout gdb
cd gdb
lintian-brush

More details

Full run details