Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc:
  mprlimit: The new name for `prlimit'.
  debian/control: Include `prlimit' and `x86-model' in the metapackage.

diff --git a/debian/changelog b/debian/changelog
index 92c369d..366be0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+distorted-utils (1.4.2) experimental; urgency=low
+
+  * locking: Compatibly improve the protocol, so that it's safe to remove
+    (or rename) lockfiles.
+  * sema: New program for hacking semaphores.
+  * xtitle: Add missing manual page.  (But please don't use the program.)
+  * Fix Debian packaging.
+  * Various internal improvements.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Wed, 01 Jun 2016 09:50:31 +0100
+
 distorted-utils (1.4.1.1) experimental; urgency=low
 
   * Build system fix: don't build `x86-model' if mLib isn't available.