On Wed, Jul 14, 2021 at 10:25:29PM +0200, Paul Gevers wrote: > Hi, > > On 12-07-2021 01:20, Jelmer Vernooij wrote: > > On Sun, Jul 11, 2021 at 09:58:30PM +0200, Paul Gevers wrote: > >> On 11-07-2021 21:47, Jelmer Vernooij wrote: > >>> It's going to be tricky to get this resolved in time before the removal of > >>> lintian-brush from testing. > >> > >> Can you elaborate why it's tricky (not promising anything, but there > >> could be reasons for t-p-u)? The current autoremoval is scheduled for > >> August 8, which is *after* the tentative release date. > > > > There have been updates to the other packages that relate to > > lintian-brush - both dependencies (python-tr, debmutate, > > upstream-ontologist, buildlog-consultant) and reverse dependencies > > ((silver-platter); we'd have to either roll those back in unstable as > > well or instead patch lintian-brush with a set of changes to lintian-brush > > that isn't really a > > roll back. > > Still not promising anything, but what would be the proposed change in > t-p-u? Please find attached the proposed change. Please note that it only affects the testsuite.
Cheers, Jelmer
commit d9d08efed57eca3f434954495dd5c84bbfa4cb12
Author: Jelmer Vernooij <jel...@debian.org>
Date: Mon Jul 19 23:26:25 2021 +0100
Fix test suite compatibility with the version of upstream-ontologist in bullseye.
diff --git a/debian/changelog b/debian/changelog
index 5431fedc..a4ef35b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lintian-brush (0.99.1) bullseye; urgency=high
+
+ * Fix test suite compatibility with the version of upstream-ontologist in
+ bullseye.
+ + Bump minimum upstream-ontologist to 0.1.22 since the test suite now
+ relies on the output from that version.
+
+ -- Jelmer Vernooij <jel...@debian.org> Mon, 19 Jul 2021 23:25:07 +0100
+
lintian-brush (0.99) unstable; urgency=medium
* Also update 'set -e' in postrm files. Closes: #983347
diff --git a/debian/control b/debian/control
index 7644abac..0cc6006c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Build-Depends: bash-completion,
python3-setuptools,
python3-ruamel.yaml,
python3-toml,
- python3-upstream-ontologist,
+ python3-tomlkit,
+ python3-upstream-ontologist (>= 0.1.22),
po-debconf,
gpg (>= 2.1),
lintian (>= 2.104.0),
@@ -42,7 +43,7 @@ Depends: devscripts,
python3-distro-info,
python3-iniparse,
python3-ruamel.yaml,
- python3-upstream-ontologist,
+ python3-upstream-ontologist (>= 0.1.22),
ognibuild,
${misc:Depends},
${python3:Depends}
diff --git a/debian/tests/control b/debian/tests/control
index 40a21b0e..9da5a58f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
Tests: tool-testsuite
-Depends: lintian-brush, python3-breezy.tests, gpg, dos2unix, libdebhelper-perl, lintian (>= 2.104.0), python3-iniparse, python3-toml, python3-levenshtein, decopy, po-debconf
+Depends: lintian-brush, python3-breezy.tests, gpg, dos2unix, libdebhelper-perl, lintian (>= 2.104.0), python3-iniparse, python3-toml, python3-levenshtein, decopy, po-debconf, python3-tomlkit
Restrictions: allow-stderr
Test-Command: deb-scrub-obsolete --version
diff --git a/tests/upstream-metadata-file/doap/message b/tests/upstream-metadata-file/doap/message
index 00d4f683..d0e9f9c9 100644
--- a/tests/upstream-metadata-file/doap/message
+++ b/tests/upstream-metadata-file/doap/message
@@ -1,3 +1,3 @@
-Set upstream metadata fields: Bug-Database, Name, Repository, Repository-Browse.
+Set upstream metadata fields: Bug-Database, Contact, Name, Repository, Repository-Browse.
Certainty: certain
Fixed-Lintian-Tags: upstream-metadata-file-is-missing, upstream-metadata-missing-repository
diff --git a/tests/upstream-metadata-file/doap/out/debian/upstream/metadata b/tests/upstream-metadata-file/doap/out/debian/upstream/metadata
index 7706a368..f6164da9 100644
--- a/tests/upstream-metadata-file/doap/out/debian/upstream/metadata
+++ b/tests/upstream-metadata-file/doap/out/debian/upstream/metadata
@@ -1,5 +1,6 @@
---
Name: blah
+Contact: Joe Maintainer
Bug-Database: http://example.com/blah/trac/newticket
Repository: http://example.com/blah/svn/trunk/
Repository-Browse: http://example.com/blah/trac/browser/
diff --git a/tests/upstream-metadata-file/fix-repository/message b/tests/upstream-metadata-file/fix-repository/message
index bda7d077..f266830a 100644
--- a/tests/upstream-metadata-file/fix-repository/message
+++ b/tests/upstream-metadata-file/fix-repository/message
@@ -1,2 +1,2 @@
-Set upstream metadata fields: Repository.
-Certainty: certain
+Set upstream metadata fields: Name, Repository.
+Certainty: possible
diff --git a/tests/upstream-metadata-file/fix-repository/out/debian/upstream/metadata b/tests/upstream-metadata-file/fix-repository/out/debian/upstream/metadata
index 8acd9d07..fcce007d 100644
--- a/tests/upstream-metadata-file/fix-repository/out/debian/upstream/metadata
+++ b/tests/upstream-metadata-file/fix-repository/out/debian/upstream/metadata
@@ -1,2 +1,3 @@
---
+Name: testdir
Repository: https://github.com/rehsack/MooX-Locale-Passthrough.git
diff --git a/tests/upstream-metadata-file/line-interrupted/message b/tests/upstream-metadata-file/line-interrupted/message
index d11681af..775753e9 100644
--- a/tests/upstream-metadata-file/line-interrupted/message
+++ b/tests/upstream-metadata-file/line-interrupted/message
@@ -1,3 +1,3 @@
-Set upstream metadata fields: Archive, Bug-Database, Bug-Submit, Name, Repository, Repository-Browse.
+Set upstream metadata fields: Archive, Bug-Database, Bug-Submit, Contact, Name, Repository, Repository-Browse.
Certainty: certain
Fixed-Lintian-Tags: upstream-metadata-missing-bug-tracking, upstream-metadata-missing-repository
diff --git a/tests/upstream-metadata-file/line-interrupted/out/debian/upstream/metadata b/tests/upstream-metadata-file/line-interrupted/out/debian/upstream/metadata
index 7da2d8ba..dbec9d30 100644
--- a/tests/upstream-metadata-file/line-interrupted/out/debian/upstream/metadata
+++ b/tests/upstream-metadata-file/line-interrupted/out/debian/upstream/metadata
@@ -1,4 +1,5 @@
Name: tsne
+Contact: Justin Donaldson <jdonald...@gmail.com>
Archive: CRAN
Bug-Database: https://github.com/jdonaldson/rtsne/issues
Bug-Submit: https://github.com/jdonaldson/rtsne/issues/new
diff --git a/tests/upstream-metadata-file/r-description/message b/tests/upstream-metadata-file/r-description/message
index 2c14a036..c5124a42 100644
--- a/tests/upstream-metadata-file/r-description/message
+++ b/tests/upstream-metadata-file/r-description/message
@@ -1,3 +1,3 @@
-Set upstream metadata fields: Archive, Bug-Database, Bug-Submit, Name, Repository, Repository-Browse.
+Set upstream metadata fields: Archive, Bug-Database, Bug-Submit, Contact, Name, Repository, Repository-Browse.
Certainty: certain
Fixed-Lintian-Tags: upstream-metadata-file-is-missing, upstream-metadata-missing-bug-tracking, upstream-metadata-missing-repository
diff --git a/tests/upstream-metadata-file/r-description/out/debian/upstream/metadata b/tests/upstream-metadata-file/r-description/out/debian/upstream/metadata
index 715b7aaa..6d2f629c 100644
--- a/tests/upstream-metadata-file/r-description/out/debian/upstream/metadata
+++ b/tests/upstream-metadata-file/r-description/out/debian/upstream/metadata
@@ -1,5 +1,6 @@
---
Name: readxl
+Contact: Jennifer Bryan <je...@rstudio.com>
Archive: CRAN
Bug-Database: https://github.com/tidyverse/readxl/issues
Bug-Submit: https://github.com/tidyverse/readxl/issues/new
diff --git a/tests/upstream-metadata-file/watch-git/message b/tests/upstream-metadata-file/watch-git/message
index c2844b31..156851dc 100644
--- a/tests/upstream-metadata-file/watch-git/message
+++ b/tests/upstream-metadata-file/watch-git/message
@@ -1,3 +1,3 @@
-Set upstream metadata fields: Repository.
-Certainty: confident
+Set upstream metadata fields: Name, Repository.
+Certainty: possible
Fixed-Lintian-Tags: upstream-metadata-file-is-missing
diff --git a/tests/upstream-metadata-file/watch-git/out/debian/upstream/metadata b/tests/upstream-metadata-file/watch-git/out/debian/upstream/metadata
index d4d13d70..d9958108 100644
--- a/tests/upstream-metadata-file/watch-git/out/debian/upstream/metadata
+++ b/tests/upstream-metadata-file/watch-git/out/debian/upstream/metadata
@@ -1,2 +1,3 @@
---
+Name: testdir
Repository: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
signature.asc
Description: PGP signature
