Hi,

you are forgetting packages using doc-debian in their autopkgtests.

Before your upload of 11.0, doc-debian contained:

/usr/share/doc-base/debian-constitution-text
/usr/share/doc-base/debian-mailing-lists
/usr/share/doc-base/debian-manifesto
/usr/share/doc-base/debian-reporting-bugs
/usr/share/doc-base/debian-social-contract

Then with 11.0 this became:

/usr/share/doc-base/doc-debian.debian-constitution-text
/usr/share/doc-base/doc-debian.debian-mailing-lists
/usr/share/doc-base/doc-debian.debian-manifesto
/usr/share/doc-base/doc-debian.debian-reporting-bugs
/usr/share/doc-base/doc-debian.debian-social-contract

This broke the autopkgtest of mmdebstrap which you can also see on the excuses
page for doc-debian: https://qa.debian.org/excuses.php?package=doc-debian

Since I noticed this breakage, I uploaded a new version of mmdebstrap that
works around this problem, assuming that this change was intentional. In
hindsight, I probably should've contacted you instead because when
investigating http://mdcc.cx/tmp/doc-debian/doc-debian_11.1_all.deb and
comparing it to the version from unstable I see:

diff -u <(curl --silent http://ftp.de.debian.org/debian/pool/main/d/doc-debian/doc-debian_11.0_all.deb | dpkg-deb -c - | awk '{print $6}' | sort) <(curl --silent http://mdcc.cx/tmp/doc-debian/doc-debian_11.1_all.deb | dpkg-deb -c - | awk '{print $6}' | sort)
--- /dev/fd/63	2023-05-11 08:18:34.782823397 +0200
+++ /dev/fd/62	2023-05-11 08:18:34.782823397 +0200
@@ -3,11 +3,11 @@
 ./usr/share/
 ./usr/share/doc/
 ./usr/share/doc-base/
-./usr/share/doc-base/doc-debian.debian-constitution-text
-./usr/share/doc-base/doc-debian.debian-mailing-lists
-./usr/share/doc-base/doc-debian.debian-manifesto
-./usr/share/doc-base/doc-debian.debian-reporting-bugs
-./usr/share/doc-base/doc-debian.debian-social-contract
+./usr/share/doc-base/debian-constitution-text
+./usr/share/doc-base/debian-mailing-lists
+./usr/share/doc-base/debian-manifesto
+./usr/share/doc-base/debian-reporting-bugs
+./usr/share/doc-base/debian-social-contract
 ./usr/share/doc/debian/
 ./usr/share/doc/debian/bug-log-access.txt
 ./usr/share/doc/debian/bug-log-mailserver.txt.gz

What are the intended paths. Should I revert my changes to mmdebstrap or not?

Also, these changes of paths in /usr/share/doc-base/ forth and back are not
recorded in debian/changelog. If the change was intended, please document it.

Thanks!

cheers, josch

tnx, i'm now preparing a new doc-debian targetted for bookworm with only
minimal changes.  will have a closer look at this issue soonish (likely today).

sorry for this hassle.

Bye,

Joost

We believe that the bug you reported is fixed in the latest version of
doc-debian, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1035913@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Joost van Baal-Ilić <joostvb@debian.org> (supplier of updated doc-debian package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
Format: 1.8
Date: Thu, 11 May 2023 09:08:22 +0200
Source: doc-debian
Architecture: source
Version: 11.2
Distribution: experimental
Urgency: high
Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
Changed-By: Joost van Baal-Ilić <joostvb@debian.org>
Closes: 1020509 1031294 1035913
Changes:
 doc-debian (11.2) experimental; urgency=high
 .
   * This release is targeted for Debian 12 bookworm: changes with what is
     in testing now are minimal and suitable for an upload late in the
     release cycle.
   * debian/TODO: added
   * Revert changes which are too intrusive for an upload during freeze.
     (Closes: #1035913) Thanks Johannes Schauer Marin Rodrigues: "changed
     /usr/share/doc-base/ paths".
   * Revert all changes introduced in 11.0 and 11.1, _except_ for
     + doc/*wml, doc/*inc: updated with latest content as found in webwml git
       sources at https://salsa.debian.org/webmaster-team/webwml.git:
       - doc/constitution.1.{0..6}.wml, doc/constitution.wml,
         doc/social-contract.{1.0,}wml: update URLs: minor fixes in wml
         syntax / layout, change http to https; in introduction, refer to
         constitution versions 1.5 (jan 2015), 1.6 (dec 2015) and
         1.7 (aug 2016)
       - bug-log-{access,mailserver}.wml, bug-maint-{info,mailcontrol}.wml,
         bug-{mailserver-refcard,reporting}.wml, bug-pkgreport-opts.inc:
         various updates.  Thanks Jakub Wilk.  (Closes: #1031294)
     + Add Debian Social Contract version 1.2:
       - doc/Makefile: add support for social-contract.1.1.wml (apr 2004).
       - doc/social-contract.*: renamed: social-contract.wml ->
         social-contract.1.1.wml
       - doc/social-contract.1.1.wml: updated header
       - doc/social-contract.wml: we now ship Debian Social Contract, Version
         1.2 ratified on October 1st, 2022.
     + Add Debian Constitution 1.9 (mar 2022) and 1.8 (jan 2022). Thanks Raúl
       Benencia.  (Closes: #1020509)
       - doc/constitution.*: renamed: constitution.wml ->
         constitution.1.7.wml
       - doc/constitution.1.8.wml: we now ship Debian Constitution 1.8 (jan
         2022)
       - doc/constitution.wml: we now ship Debian Constitution 1.9 (mar 2022)
     + doc/mailing-lists.txt: Update with may 2023 content from web pages.
     + doc/Makefile: fix/update error message for missing $(WEBWML).
Checksums-Sha1:
 be83dbcdea2757dba4014f18410f78795b1f5c67 1640 doc-debian_11.2.dsc
 5d1db0b9121f47a4b3dbe8f8e6922d83a5a2a8c5 70796 doc-debian_11.2.tar.xz
 9835ddcfdd339f174972285eeab9244659d52d0c 4755 doc-debian_11.2_source.buildinfo
Checksums-Sha256:
 efca50124afa11f70a4d8a5f8197a390337321232c5f9d93afd4fda2782826f7 1640 doc-debian_11.2.dsc
 48605764a0318d82ca23c8afd9e399931df6510a251ef9ab8030c5de3749a492 70796 doc-debian_11.2.tar.xz
 aa46cfb03eddc85f7f2a6e449dcf1db2509f80b040fcdb364c98c300d3974166 4755 doc-debian_11.2_source.buildinfo
Files:
 7b3a6c01202c1dc155334fc80fc7b8bf 1640 doc standard doc-debian_11.2.dsc
 abc3407b45ac19a09a23f2a2d99c33c3 70796 doc standard doc-debian_11.2.tar.xz
 b9c8c8d9c5d85c919d695d5130bc1d0f 4755 doc standard doc-debian_11.2_source.buildinfo
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEkqrZAbIbS8eaR6AwVPGmYxdIZxMFAmRcs3cACgkQVPGmYxdI
ZxMQAQ//QwgwdcQM9rcWWYGOKy26t+1gWprSVY98/f1efBZkSPbnyl3Iqbj2nGXu
i5zo6dpuKmpriiJUUjJnyN3q5RaNN0jcmSZV90bAAu5v03jFTCaKCdFS8/hrehuX
SSQBYQJ1Hxp4uhtgj4QQFuGiiLVdQuTe/YCGtFAc9TpT+e4uqcYy8zCTai1Q+XZ2
8XxUeh4SmYZxx6Y9tsbb2huwEMdIiwPvglhP8y6rbQE4BEpH3ldGh/hesV1CsvKN
eYDjvxCA6VVH7iMpEqIUbXzp5FpclTleJ+o7r8CXqg8gjMD9T5yDPqjIB/Jbjv5B
2zF2lheZEaQ2wohC1zCicFPz8kfQLho011myB80jvFWWuwkXuX+ePO3pfhHj0oR5
/6jMSvBxvZf4GQlu8+eInWmUKpOWykzNiUlKlWxGIbNRuCFDzyBXG2e+RfN0Oc+U
Q26WZCUGT/f3aW7EzbUcP4chR1XldRTeEMw0mauWT2TFMLXgOk9pjC0gOr+PRFEm
SWAig2L8QdItn9hYZaZ6kBFVvAAROKZ7Kb+dKRlw09349d9ROnvXiYa+n8PEJxhI
hlNfdPqCyQxT1X1EQrWHASjMIO175lblV216RXBZcsLhSs/NR0YF8F4CtCfOv3Dz
i8tPBWW/K8HbCd0bPupfeSbxjL3Jb75PaSFBYDA+75cYANh+AqI=
=2z2j
-----END PGP SIGNATURE-----

Hi,

I do not understand that last changelog entry. Reverting "changes which are too
intrusive for an upload during freeze" sounds like you are going back to this:

/usr/share/doc-base/debian-constitution-text
/usr/share/doc-base/debian-mailing-lists
/usr/share/doc-base/debian-manifesto
/usr/share/doc-base/debian-reporting-bugs
/usr/share/doc-base/debian-social-contract

But the package in experimental is shipping this:

$ curl --silent https://incoming.debian.org/debian-buildd/pool/main/d/doc-debian/doc-debian_11.2_all.deb | dpkg-deb -c - | grep doc-base
drwxr-xr-x root/root         0 2023-05-11 09:08 ./usr/share/doc-base/
-rw-r--r-- root/root       578 2020-12-31 08:50 ./usr/share/doc-base/doc-debian.debian-constitution-text
-rw-r--r-- root/root       238 2020-12-31 08:50 ./usr/share/doc-base/doc-debian.debian-mailing-lists
-rw-r--r-- root/root       502 2020-12-31 08:50 ./usr/share/doc-base/doc-debian.debian-manifesto
-rw-r--r-- root/root       278 2020-12-31 08:50 ./usr/share/doc-base/doc-debian.debian-reporting-bugs
-rw-r--r-- root/root       550 2020-12-31 08:50 ./usr/share/doc-base/doc-debian.debian-social-contract

So the paths actually did *not* get reverted to how they were before 11.0?

Thanks!

cheers, josch

Thanks for this.  Apparently the buildengine used gives different results than
the one I used locally to check before uploading.  This bug should get
reopened.  I'll investigate.

Bye,

Joost

Hi again,

ok this is not trivial.  even in a sid chroot it installs
usr/share/doc-base/doc-debian.debian-constitution-text , and does not install
usr/share/doc-base/debian-constitution-text .  changing dh compat level to the
current one does not fix it.  dh_installdocs(1) does not help me.  i'll
investigate more...

Thanks again, Bye,

Joost

reopen 1035913
thanks

On Thu, May 11, 2023 at 01:55:48PM +0200, Joost van Baal-Ilić wrote:
<snip>

Doing so.

Bye,

Joost

Hi,

Quoting Joost van Baal-Ilić (2023-05-11 15:35:24)

you cannot go back to the old doc-base paths. The package name is part of the
path since this debhelper commit from 2021:

https://salsa.debian.org/debian/debhelper/-/commit/8eac421c260e62bcecd571af225438e107b33157

Thanks!

cheers, josch

Hi,

( fixing bug https://bugs.debian.org/980903 . )

A!  That explains!  Thanks a lot.  I now have a plan again; will get to it
within a week.

Bye,

Joost

Hi,

Quoting Joost van Baal-Ilić (2023-05-12 07:01:45)

can we finish this a bit quicker than that? The full freeze is at 2023-05-24
and my package is also broken by dash in experimental, so the upload of my
package has to be coordinated with dash and doc-debian. The earlier you are
ready, the earlier not only my package but also dash can be unblocked.

Sorry, this would've been much more relaxed if the doc-debian upload did not
happen during hard freeze...

Thanks!

cheers, josch

Hi again!

TL;DR: I believe I can upload a fix to experimental & ask for unblock in the
coming weekend.
scheduled to end up in bookworm which is causing trouble in your package (and dash
(!)).

And I understand you want to be sure doc-debian in bookworm will ship the
new-style /usr/share/doc-base/doc-debian.debian-constitution-text e.a. , not
the old-style /usr/share/doc-base/debian-constitution-text .

I am very sorry it took me so long to find some time to work on these long
standing issues.  (In my defense: I've explicitly asked for more hands:
https://lists.debian.org/msgid-search/20230201193812.GB28569@beskar.mdcc.cx .
And: I'm am not the doc-debian maintainer; I'm merely an uploader.)

Anyway, I'll likely have time to work on this during the coming weekend; I
believe I can do a fixed upload then, thanks to your very helpful hints.  (And,
risking stating the obvious here: NMU's very welcome.)

Thanks, Bye,

Joost

Hi,

Quoting Joost van Baal-Ilić (2023-05-12 09:12:23)

cool!

I actually care little about which version it is and only want to know what it
will be so that I can adapt my package accordingly. But we already learned that
with current debhelper it will always be the former version.

Sorry, I didn't want to come across as rude. I'm also just doing all this as a
volunteer in my limited free time just like you. Though it seems in practice
you have become the de-facto doc-debian maintainer now -- congratulations. :)

If you want me to do something, just mail me what you need and I'll see whether
I can find some time to take care of it.

Thanks!

cheers, josch

Hi josch,

<snip>

Hehe :)

Thanks for this kind message.

I've just uploaded doc-debian/11.3 to experimental and reopened the unblock
request in #1035710 (unblock: doc-debian/11.3).

Thanks!

Bye

Joost