Bug#992851: apt-setup generated sources.list differs from sources.list(5)

[Daniel Lewart <lewart3@gmail.com>]

Package: apt-setup
Version: 1:0.166
Severity: minor
Tags: d-i patch

Debian Install System Team,

sources.list(5) has the following example:
  deb http://deb.debian.org/debian bullseye main contrib non-free
  deb http://security.debian.org bullseye-security main contrib non-free

apt-setup generates a slightly different /etc/apt/sources.list:
  deb http://deb.debian.org/debian/ bullseye main contrib non-free
  deb http://security.debian.org/debian-security bullseye-security main contrib non-free

I consider sources.list(5) to be authoritative.
Therefore, I think the two stanzas above should be identical.

Attached is a patch which:
  1) Removes trailing slashes from URIs
  2) Omits /debian-security if host is security.debian.org
  3) Removes unused suite from 92updates and 93backports
  4) Reverts "$hostname$directory" to original "$hostname/$directory"
  5) Cleans up various syntax issues

If the Maintainers do not like any of the above changes,
I would be happy to resubmit an updated patch.

Thank you!
Daniel Lewart
Urbana, Illinois