Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 950693902ae62adadd611811f5c3fb991ca455e8..e1a47f6e8ca64a0c5635f90d376e93cac8ff6a87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,16 @@ e2fsprogs (1.42.13-1) unstable; urgency=low
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 17 May 2015 20:38:27 -0400
 
+e2fsprogs (1.43~WIP-2015-03-29-1) unstable; urgency=low
+
+  * Merge in updates from the maint branch (changes from 1.42.12-1)
+  * Add support for inline directories
+  * Add support for the jbd2 checksum v3 format
+  * New dumpe2fs format
+  * Add support for file encryption feature
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 14 Dec 2014 22:49:03 -0500
+
 e2fsprogs (1.42.12-1.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -138,6 +148,12 @@ e2fsprogs (1.42.10-1.1) unstable; urgency=medium
 
  -- Hilko Bengen <bengen@debian.org>  Sat, 21 Jun 2014 12:57:25 +0200
 
+e2fsprogs (1.43~WIP-2014-02-04-1) unstable; urgency=low
+
+  * Merge in updates from the maint branch (changes from 1.42.10-1)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Wed, 04 Feb 2014 23:31:56 -0500
+
 e2fsprogs (1.42.10-1) unstable; urgency=medium
 
   * New upstream version
@@ -360,6 +376,12 @@ e2fsprogs (1.42.7-1) unstable; urgency=low
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 21 Jan 2013 21:52:58 -0500
 
+e2fsprogs (1.43~WIP-2012-09-22-1) unstable; urgency=low
+
+  * Add metadata checksum feature
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 22 Sep 2012 21:50:20 -0400
+
 e2fsprogs (1.42.6-1) unstable; urgency=low
 
   * New upstream version