Please merge debmirror 1:2.34 (universe) from Debian testing (main)

[Valters Jansons]

Upstream has released debmirror 1:2.34:

  [ Debian Janitor ]
  * Bump debhelper from old 9 to 12.
  * Fix day-of-week for changelog entry 20040926.

  [ Colin Watson ]
  * Avoid two-argument open.
  * Avoid bareword file handles.
  * Correct example in debmirror(1) (closes: #970435).

This conflicts and needs to be manually resolved.

[Valters Jansons (sigv)]

The proposed merge modifies ubuntu-settings.patch, replacing:
- documentation "lucid, oneiric, precise" text with "bionic, focal, impish";
- documentation "-d lucid -d precise" example with "-d focal -d impish";
- code defaults "precise" with "impish".

The debmirror_2.33ubuntu1-2.34ubuntu1.debdiff highlights this difference clearly.

[Brian Murray (brian-murray)]

I've uploaded this for Impish, thanks for doing the merge!

[Launchpad Janitor (janitor)]

This bug was fixed in the package debmirror - 1:2.34ubuntu1

---------------
debmirror (1:2.34ubuntu1) impish; urgency=medium

  * Merge from Debian testing (LP: #1926120). Remaining changes:
    - debian/{control,rules}: Add quilt for patch management.
    - Debian bug 455082:
      + default-settings.patch: change rsync defaults.
      + silence-errors.patch: throw away find errors.
      + drop-redundant-rsync.patch: clean up logic in rsync batching.
      + check_file-return.patch: report why a file needs to sync.
    - Debian bug 576576:
      + skip-installer.patch: allow specific releases to be skipped.
    - ubuntu-settings.patch: Changed defaults to download Ubuntu,
      replaced most instances of Debian with Ubuntu in the
      documentation.

debmirror (1:2.34) unstable; urgency=medium

  [ Debian Janitor ]
  * Bump debhelper from old 9 to 12.
  * Fix day-of-week for changelog entry 20040926.

  [ Colin Watson ]
  * Avoid two-argument open.
  * Avoid bareword file handles.
  * Correct example in debmirror(1) (closes: #970435).

 -- Valters Jansons <email address hidden> Mon, 26 Apr 2021 15:00:09 +0300