usrmerge (17ubuntu1) cosmic; urgency=medium

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

 -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 29 May 2018 10:30:35 +0100

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 <md@linux.it>  Sun, 05 Nov 2017 19:14:38 +0100

usrmerge (16) unstable; urgency=medium

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

 -- Marco d'Itri <md@linux.it>  Wed, 31 May 2017 14:37:35 +0200

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 <md@linux.it>  Tue, 21 Mar 2017 23:19:50 +0100

usrmerge (14) unstable; urgency=medium

  * Make convert-usrmerge restore the SELinux context for the newly
    created top level symlinks. (Closes: #850274)

 -- Marco d'Itri <md@linux.it>  Mon, 27 Feb 2017 02:03:26 +0100

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 <md@linux.it>  Mon, 12 Dec 2016 05:23:20 +0100

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 <md@linux.it>  Thu, 29 Sep 2016 18:42:37 +0200

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 <md@linux.it>  Tue, 15 Mar 2016 08:42:53 +0100

usrmerge (10) unstable; urgency=medium

  * dpkg.cfg: removed open-iscsi and tcsh (see #810276 and #767927).
  * Ask with debconf if convert-usrmerge should be run. (Closes: #797417)
  * New debconf translation(s): it.

 -- Marco d'Itri <md@linux.it>  Sun, 28 Feb 2016 02:02:03 +0100

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 <md@linux.it>  Wed, 10 Feb 2016 04:56:33 +0100

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 <md@linux.it>  Fri, 22 Jan 2016 07:07:50 +0100

usrmerge (7) unstable; urgency=medium

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

 -- Marco d'Itri <md@linux.it>  Sat, 16 Jan 2016 03:51:37 +0100

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 <md@linux.it>  Sat, 09 Jan 2016 04:33:13 +0100

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 <md@linux.it>  Thu, 07 Jan 2016 02:55:40 +0100

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 <md@linux.it>  Mon, 04 Jan 2016 05:12:46 +0100

usrmerge (3) unstable; urgency=medium

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

 -- Marco d'Itri <md@linux.it>  Sun, 27 Dec 2015 14:26:51 +0100

usrmerge (2) unstable; urgency=medium

  * Uploaded to the archive.

 -- Marco d'Itri <md@linux.it>  Wed, 05 Aug 2015 05:09:52 +0200

usrmerge (1) UNRELEASED; urgency=medium

  * Initial release.
  * Added a conflict with zsh (see #768079).

 -- Marco d'Itri <md@linux.it>  Tue, 04 Nov 2014 22:42:44 +0100
