[ubuntu/lunar-proposed] usrmerge 33ubuntu1 (Accepted)

[Benjamin Drung]

usrmerge (33ubuntu1) lunar; urgency=medium

  * Merge from Debian unstable. Remaining changes:
    - Drop usrmerge.maintscript.
    - debian/rules, debian/control, convert-etc-shells, convert-usrmerge:
      Vendorize a few Perl modules, to make usrmerge only depend on
      perl-base.

usrmerge (33) unstable; urgency=medium

  * Added a version number to the conflict with cruft. (See #941998.)
  * convert-usrmerge: stop if /lib/modules/ is a mount point, which is
    common on User Mode Linux. (Closes: #1021180)
  * Implemented only for Hurd systems a modified algorithm provided by
    Samuel Thibault. (Closes: #1020463)

usrmerge (32) unstable; urgency=medium

  * convert-usrmerge: fix handling the link X directory case.
    The case in which the source and destination are a symlink and a
    directory (or a directory and a symlink) actually was never handled.
    (Closes: #1020312)
  * Updated the versioned conflict with libpng12-0. (Closes: #1020549)
  * Relabel for SELinux the newly created directories and /etc/shells,
    courtesy of Christian Göttsche.

usrmerge (31) unstable; urgency=medium

  [ Luca Boccassi ]
  * usr-is-merged.preinst: run the check on upgrades too, because something
    may have un-merged the system since the last install. (See #926699.)

usrmerge (30+nmu2) unstable; urgency=medium

  [ Luca Boccassi ]
  * Non-maintainer upload.
  * overlayfs: attempt to move directory before bailing out (Closes:
    #1020228)

  [ Dimitri John Ledkov ]
  * Update regexp for new (temporary) ldd output

usrmerge (30+nmu1) unstable; urgency=medium

  * Non-maintainer upload.
  * maintainer scripts: shellcheck fixes
  * maintainer scripts: fix running arm64 on nspawn (Closes: #1019575)

usrmerge (30) unstable; urgency=medium

  * Use in usrmerge.postinst the same logic to determine if /usr is
    merged or not that was already being in usr-is-merged.preinst and
    convert-usrmerge. (Closes: #1019506)

Date: Tue, 22 Nov 2022 11:37:03 +0100
Changed-By: Benjamin Drung <bdrung at ubuntu.com>
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
https://launchpad.net/ubuntu/+source/usrmerge/33ubuntu1
-------------- next part --------------
Format: 1.8
Date: Tue, 22 Nov 2022 11:37:03 +0100
Source: usrmerge
Built-For-Profiles: noudeb
Architecture: source
Version: 33ubuntu1
Distribution: lunar
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Benjamin Drung <bdrung at ubuntu.com>
Closes: 1019506 1019575 1020228 1020312 1020463 1020549 1021180
Changes:
 usrmerge (33ubuntu1) lunar; urgency=medium
 .
   * Merge from Debian unstable. Remaining changes:
     - Drop usrmerge.maintscript.
     - debian/rules, debian/control, convert-etc-shells, convert-usrmerge:
       Vendorize a few Perl modules, to make usrmerge only depend on
       perl-base.
 .
 usrmerge (33) unstable; urgency=medium
 .
   * Added a version number to the conflict with cruft. (See #941998.)
   * convert-usrmerge: stop if /lib/modules/ is a mount point, which is
     common on User Mode Linux. (Closes: #1021180)
   * Implemented only for Hurd systems a modified algorithm provided by
     Samuel Thibault. (Closes: #1020463)
 .
 usrmerge (32) unstable; urgency=medium
 .
   * convert-usrmerge: fix handling the link X directory case.
     The case in which the source and destination are a symlink and a
     directory (or a directory and a symlink) actually was never handled.
     (Closes: #1020312)
   * Updated the versioned conflict with libpng12-0. (Closes: #1020549)
   * Relabel for SELinux the newly created directories and /etc/shells,
     courtesy of Christian Göttsche.
 .
 usrmerge (31) unstable; urgency=medium
 .
   [ Luca Boccassi ]
   * usr-is-merged.preinst: run the check on upgrades too, because something
     may have un-merged the system since the last install. (See #926699.)
 .
 usrmerge (30+nmu2) unstable; urgency=medium
 .
   [ Luca Boccassi ]
   * Non-maintainer upload.
   * overlayfs: attempt to move directory before bailing out (Closes:
     #1020228)
 .
   [ Dimitri John Ledkov ]
   * Update regexp for new (temporary) ldd output
 .
 usrmerge (30+nmu1) unstable; urgency=medium
 .
   * Non-maintainer upload.
   * maintainer scripts: shellcheck fixes
   * maintainer scripts: fix running arm64 on nspawn (Closes: #1019575)
 .
 usrmerge (30) unstable; urgency=medium
 .
   * Use in usrmerge.postinst the same logic to determine if /usr is
     merged or not that was already being in usr-is-merged.preinst and
     convert-usrmerge. (Closes: #1019506)
Checksums-Sha1:
 fd33ffdeaa052fe0108a9dde17599f2b70cc6f91 1717 usrmerge_33ubuntu1.dsc
 c9fd59e007c70df2af3958f3422ba4026e01feb7 14900 usrmerge_33ubuntu1.tar.xz
 a2e53d4f8c47ac5964f1879bd814e4eaf548f445 7354 usrmerge_33ubuntu1_source.buildinfo
Checksums-Sha256:
 762b2d730cc33ca6cb55e7603cc04a27d3101802c9641a92d7a86520fd087e5b 1717 usrmerge_33ubuntu1.dsc
 5d27ae457da54cb4bd3fac84c07422e9377cf645a8425dcf795195544aca9701 14900 usrmerge_33ubuntu1.tar.xz
 19a70231e515c8e4b0b3f5af574fa436f3ea625222d3485f87f92f4a1e4da210 7354 usrmerge_33ubuntu1_source.buildinfo
Files:
 6b0c3dc099de109a354ff89bb3cf98a4 1717 admin optional usrmerge_33ubuntu1.dsc
 4825b380243e0e094767dd0e1cce43f8 14900 admin optional usrmerge_33ubuntu1.tar.xz
 46dc73ef60b38063dc353f24f3ae43b6 7354 admin optional usrmerge_33ubuntu1_source.buildinfo
Original-Maintainer: Marco d'Itri <md at linux.it>