Change log for usrmerge package in Ubuntu

usrmerge (38ubuntu1) noble; urgency=medium

  * Merge with 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.

 -- Ravi Kant Sharma <email address hidden>  Wed, 03 Jan 2024 13:45:36 +0100

Available diffs

• diff from 35ubuntu1 to 38ubuntu1 (4.2 KiB)

usrmerge (35ubuntu1) mantic; 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.

Available diffs

• diff from 33ubuntu1 to 35ubuntu1 (2.6 KiB)

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.

Available diffs

• diff from 29ubuntu2 to 33ubuntu1 (5.8 KiB)

usrmerge (29ubuntu2) kinetic; urgency=medium

  * Change regexp for early conversion files to account for new ldd
    output. Previously:
    ldd /bin/cp
      linux-vdso.so.1 (0x00007fff4ffb3000)
      /lib64/ld-linux-x86-64.so.2 (0x00007f857f0e3000)
    Now is:
    ldd /bin/cp
      linux-vdso.so.1 => linux-vdso.so.1 (0x00007ffc035e5000)
      /lib64/ld-linux-x86-64.so.2 => /lib64/ld-linux-x86-64.so.2 (0x00007f07f15de000)
    Which breaks usrmerge conversion.

 -- Dimitri John Ledkov <email address hidden>  Tue, 06 Sep 2022 16:58:47 +0100

Available diffs

• diff from 29ubuntu1 to 29ubuntu2 (638 bytes)

usrmerge (29ubuntu1) kinetic; 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.
    Dropped changes:
    - Drop debconf prompts, translations, applied upstream.
    - Clear generated files if they have already been re-generated,
      applied upstream. (LP: #1930573)

Available diffs

• diff from 25ubuntu2 to 29ubuntu1 (4.2 KiB)

usrmerge (24ubuntu3.1) hirsute; urgency=medium

  * Clear generated files if they have already been re-generated (LP: #1930573)

 -- Lukas Märdian <email address hidden>  Tue, 26 Oct 2021 12:47:37 +0200

Available diffs

• diff from 24ubuntu3 to 24ubuntu3.1 (657 bytes)

usrmerge (25ubuntu1.1) impish; urgency=medium

  * Clear generated files if they have already been re-generated (LP: #1930573)

 -- Lukas Märdian <email address hidden>  Tue, 26 Oct 2021 12:42:55 +0200

Available diffs

• diff from 25ubuntu1 to 25ubuntu1.1 (649 bytes)

usrmerge (25ubuntu2) jammy; urgency=medium

  * Clear generated files if they have already been re-generated (LP: #1930573)

 -- Lukas Märdian <email address hidden>  Tue, 26 Oct 2021 11:12:18 +0200

Available diffs

• diff from 25ubuntu1 to 25ubuntu2 (650 bytes)

usrmerge (25ubuntu1) impish; urgency=low

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

Available diffs

• diff from 24ubuntu3 to 25ubuntu1 (1.7 KiB)

usrmerge (24ubuntu3) hirsute; urgency=medium

  * Fix failure to build from source, when multiple perl-modules-* are
    installed.

Available diffs

• diff from 24ubuntu1 to 24ubuntu3 (1.2 KiB)
• diff from 24ubuntu2 to 24ubuntu3 (731 bytes)

usrmerge (24ubuntu2) hirsute; urgency=medium

  * Vendorize a few perl modules, to make usrmerge only depend on
    perl-base.

 -- Dimitri John Ledkov <email address hidden>  Tue, 13 Apr 2021 11:02:45 +0100

Available diffs

• diff from 24ubuntu1 to 24ubuntu2 (1.1 KiB)

usrmerge (24ubuntu1) hirsute; urgency=medium

  * Drop debconf prompts, translations, and unused maintainer scripts. LP:
    #1915731

 -- Dimitri John Ledkov <email address hidden>  Mon, 15 Feb 2021 16:35:28 +0000

Available diffs

• diff from 24 (in Debian) to 24ubuntu1 (4.8 KiB)

usrmerge (24) unstable; urgency=medium

  * Moved the scripts to /usr/lib/usrmerge/ on request of Ubuntu for better
    FHS compliance.
  * README.Debian: removed a reference to /etc/dpkg/dpkg.cfg.d/usrmerge:
    the file can be ignored since it has been empty or missing since 2016.
    (Closes: #940077)

 -- Marco d'Itri <email address hidden>  Sat, 16 Jan 2021 06:02:21 +0100

Available diffs

• diff from 23ubuntu1 (in Ubuntu) to 24 (2.2 KiB)

usrmerge (23ubuntu1) hirsute; urgency=medium

  * Move scripts into a subdir.

 -- Dimitri John Ledkov <email address hidden>  Fri, 15 Jan 2021 15:43:16 +0000

Available diffs

• diff from 23 (in Debian) to 23ubuntu1 (832 bytes)

usrmerge (23) unstable; urgency=medium

  * Converted to dh.

 -- Marco d'Itri <email address hidden>  Tue, 03 Sep 2019 02:20:46 +0200

Available diffs

• diff from 17ubuntu1 (in Ubuntu) to 23 (3.4 KiB)

usrmerge (17ubuntu1) cosmic; urgency=medium

  * Add versioned conflicts for fixes safe-rm in Ubuntu.

 -- Dimitri John Ledkov <email address hidden>  Tue, 29 May 2018 10:30:35 +0100

Available diffs

• diff from 17 (in Debian) to 17ubuntu1 (667 bytes)

usrmerge (17) unstable; urgency=medium

  * Defer the conversion of temporarily-broken symlinks in subdirectories
    too, to prevent leaving them broken if the program aborts.
    (Closes: #848504, #871706)
  * Added again a version to the conflict with molly-guard (see #837928).

 -- Marco d'Itri <email address hidden>  Sun, 05 Nov 2017 19:14:38 +0100

Available diffs

• diff from 16 to 17 (943 bytes)

usrmerge (16) unstable; urgency=medium

  * Added a version to the conflict with ksh (see #810158).

 -- Marco d'Itri <email address hidden>  Wed, 31 May 2017 14:37:35 +0200

Available diffs

• diff from 15 to 16 (451 bytes)

usrmerge (15) unstable; urgency=medium

  * Updated the version of the conflict with xfslibs-dev, because the
    package was broken again later (see #766811).
  * Added a version to the conflict with yp-tools (see #812532).

 -- Marco d'Itri <email address hidden>  Tue, 21 Mar 2017 23:19:50 +0100

Available diffs

• diff from 13 to 15 (6.2 KiB)

usrmerge (13) unstable; urgency=medium

  * Do not run convert-usrmerge on NFS systems. (Closes: #842145)
  * Added a version to the conflict with elvis-tiny (see #813857).
  * Added a versioned conflict with libjson-c-dev (see #843145).

 -- Marco d'Itri <email address hidden>  Mon, 12 Dec 2016 05:23:20 +0100

Available diffs

• diff from 12 to 13 (5.9 KiB)

usrmerge (12) unstable; urgency=medium

  * Added a conflict with molly-guard. (Closes: #837925)
  * Updated the versioned conflict with zsh. (Closes: #824205)
  * New debconf translation(s): pt, de, nl, pt_BR.
    (Closes: #818636, 818656, 823443, 829342)

 -- Marco d'Itri <email address hidden>  Thu, 29 Sep 2016 18:42:37 +0200

Available diffs

• diff from 11 to 12 (2.7 KiB)

usrmerge (11) unstable; urgency=medium

  * dpkg.cfg: removed libpng12-0 (see #766809).
    No dpkg.cfg workarounds are used anymore.
  * After the conversion, use the new convert-etc-shells program to add
    to /etc/shells /usr-based paths for each shell in /. (Closes: #817119)
  * New debconf translation(s): fr. (Closes: #818144)

 -- Marco d'Itri <email address hidden>  Tue, 15 Mar 2016 08:42:53 +0100

Available diffs

• diff from 9 to 11 (4.2 KiB)

usrmerge (9) unstable; urgency=medium

  * dpkg.cfg: removed acl, policycoreutils and musl-dev (see #767925,
    #767930 and #766812).
  * Added conflicts with elvis-tiny and yp-tools (see #813857 and #812532).
  * Added a version to the conflicts with mksh and zsh (see #807185 and
    #768079).
  * Updated the versioned conflict with davfs2, molly-guard and xfslibs-dev
    (see #812535 and #766811).

 -- Marco d'Itri <email address hidden>  Wed, 10 Feb 2016 04:56:33 +0100

Available diffs

• diff from 7 to 9 (1.3 KiB)
• diff from 8 to 9 (1.1 KiB)

usrmerge (8) unstable; urgency=medium

  * Added Breaks with older cruft-ng and initramfs-tools.
    (Closes: #810860, #811317)
  * dpkg.cfg: removed coreutils.
  * Added a conflict with older open-vm-tools.

 -- Marco d'Itri <email address hidden>  Fri, 22 Jan 2016 07:07:50 +0100

Available diffs

• diff from 7 to 8 (824 bytes)

usrmerge (7) unstable; urgency=medium

  * On EBUSY, list the services using ProtectSystem.
  * dpkg.cfg: removed less and libbrlapi-dev.

 -- Marco d'Itri <email address hidden>  Sat, 16 Jan 2016 03:51:37 +0100

Available diffs

• diff from 6 to 7 (990 bytes)

usrmerge (6) unstable; urgency=high

  * Add support for ppc64el to directories_to_merge().
  * Check for free space in /usr before attempting the conversion.
  * dpkg.cfg: removed cryptsetup, libusb-0.1-4, xfsdump and xfslibs-dev.
  * dpkg.cfg: added open-iscsi.
  * Added a conflict with open-vm-tools.
  * Added a conflict with older vsearch.

 -- Marco d'Itri <email address hidden>  Sat, 09 Jan 2016 04:33:13 +0100

Available diffs

• diff from 5 to 6 (2.1 KiB)

usrmerge (5) unstable; urgency=medium

  * Create empty multilib and multiarch library directories.
    (Closes: #810091)
  * dpkg.cfg: removed davfs2, kbd and libdm0-dev.
  * Added a conflict with ksh.

 -- Marco d'Itri <email address hidden>  Thu, 07 Jan 2016 02:55:40 +0100

Available diffs

• diff from 4 to 5 (2.5 KiB)

usrmerge (4) unstable; urgency=medium

  * Fixed the conversion of symlinks with the same name in / and /usr,
    which was broken in many cases and broke libpng12-0. (Closes: #809495)
    The code still does not handle automatically all possible combinations,
    but we only need it to work around the few buggy packages with
    duplicated symlinks.
  * Preinst: check if an initramfs is being used.

 -- Marco d'Itri <email address hidden>  Mon, 04 Jan 2016 05:12:46 +0100

Available diffs

• diff from 3 to 4 (1.6 KiB)

usrmerge (3) unstable; urgency=medium

  * Added a conflict with mksh (see #807185).
  * debian/control: add the Homepage field. (Closes: #798056)

 -- Marco d'Itri <email address hidden>  Sun, 27 Dec 2015 14:26:51 +0100

Available diffs

• diff from 2 to 3 (681 bytes)

usrmerge (2) unstable; urgency=medium

  * Uploaded to the archive.

 -- Marco d'Itri <email address hidden>  Wed, 05 Aug 2015 05:09:52 +0200