From: Theodore Ts'o Date: Wed, 5 Feb 2014 20:16:11 +0000 (-0500) Subject: Merge branch 'maint' into next X-Git-Tag: v1.43-WIP-2015-05-18~356 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f70a347dbadb3df1e4761ce17d389e50bd13a8d8;p=thirdparty%2Fe2fsprogs.git Merge branch 'maint' into next Conflicts: debian/changelog debian/e2fslibs.symbols version.h --- f70a347dbadb3df1e4761ce17d389e50bd13a8d8 diff --cc debian/changelog index c2854ee14,ce5020f78..2d00c309a --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,18 +1,24 @@@ - e2fsprogs (1.43~WIP-2013-12-28-1) unstable; urgency=low ++e2fsprogs (1.43~WIP-2014-02-04-1) unstable; urgency=low + - * Add metadata checksum feature ++ * Merge in updates from the maint branch (changes from 1.42.9-3) + - -- Theodore Y. Ts'o Mon, 28 Dec 2013 23:25:42 -0400 ++ -- Theodore Y. Ts'o Wed, 04 Feb 2014 23:31:56 -0500 ++ + e2fsprogs (1.42.9-3) unstable; urgency=medium + + * Add the ability for mke2fs to create hugefiles + * Add support for the sparse_super2 compat feature + * Mke2fs can now force all of the metadata blocks to be at the + beginning of the file system + * Fix loopback mount detection (Closes: #497984) + * Add support to mke2fs to create a file system at an offset + (Closes: #417385) + * Mention badblocks in the package description (Closes: #718725) + * Update/fix various man pages (Closes: #719184, #719189) + * Improve e2fsck's "superblock corrupt" message (Closes: #719185) + * Miscellaneous Coverity clean ups + + -- Theodore Y. Ts'o Tue, 04 Feb 2014 22:17:22 -0500 e2fsprogs (1.42.9-2) unstable; urgency=low diff --cc debian/e2fslibs.symbols index fd673c2e0,5422544f9..8a88efe3a --- a/debian/e2fslibs.symbols +++ b/debian/e2fslibs.symbols @@@ -44,9 -44,9 +44,10 @@@ libext2fs.so.2 e2fslibs #MINVER ext2fs_add_dir_block2@Base 1.42 ext2fs_add_dir_block@Base 1.37 ext2fs_add_journal_device@Base 1.37 + ext2fs_add_journal_inode2@Base 1.42.9-3~ ext2fs_add_journal_inode@Base 1.37 ext2fs_adjust_ea_refcount2@Base 1.42 + ext2fs_adjust_ea_refcount3@Base 1.43~WIP-2012-08-01 ext2fs_adjust_ea_refcount@Base 1.37 ext2fs_alloc_block2@Base 1.42 ext2fs_alloc_block@Base 1.37 @@@ -88,9 -88,7 +89,10 @@@ ext2fs_blkmap64_rbtree@Base 1.42.1 ext2fs_block_alloc_stats2@Base 1.42 ext2fs_block_alloc_stats@Base 1.37 + ext2fs_block_bitmap_checksum@Base 1.43~WIP-2012-08-01 + ext2fs_block_bitmap_csum_set@Base 1.43~WIP-2012-08-01 + ext2fs_block_bitmap_csum_verify@Base 1.43~WIP-2012-08-01 + ext2fs_block_alloc_stats_range@Base 1.42.9-3~ ext2fs_block_bitmap_loc@Base 1.42 ext2fs_block_bitmap_loc_set@Base 1.42 ext2fs_block_iterate2@Base 1.37 @@@ -309,23 -300,16 +315,23 @@@ ext2fs_image_inode_write@Base 1.37 ext2fs_image_super_read@Base 1.37 ext2fs_image_super_write@Base 1.37 + ext2fs_init_csum_seed@Base 1.43~WIP-2012-08-01 ext2fs_init_dblist@Base 1.37 ext2fs_initialize@Base 1.37 + ext2fs_initialize_dirent_tail@Base 1.43~WIP-2012-08-01 ext2fs_inode_alloc_stats2@Base 1.37 ext2fs_inode_alloc_stats@Base 1.37 + ext2fs_inode_bitmap_checksum@Base 1.43~WIP-2012-08-01 + ext2fs_inode_bitmap_csum_set@Base 1.43~WIP-2012-08-01 + ext2fs_inode_bitmap_csum_verify@Base 1.43~WIP-2012-08-01 ext2fs_inode_bitmap_loc@Base 1.42 ext2fs_inode_bitmap_loc_set@Base 1.42 + ext2fs_inode_csum_set@Base 1.43~WIP-2012-08-01 + ext2fs_inode_csum_verify@Base 1.43~WIP-2012-08-01 ext2fs_inode_data_blocks2@Base 1.42 ext2fs_inode_data_blocks@Base 1.37 - ext2fs_inode_has_valid_blocks@Base 1.37 ext2fs_inode_has_valid_blocks2@Base 1.42 + ext2fs_inode_has_valid_blocks@Base 1.37 ext2fs_inode_i_blocks@Base 1.42 ext2fs_inode_io_intern2@Base 1.37 ext2fs_inode_io_intern@Base 1.37 diff --cc version.h index 67d4d9aec,f99ce493d..9eb6e94c4 --- a/version.h +++ b/version.h @@@ -7,5 -7,5 +7,5 @@@ * file may be redistributed under the GNU Public License v2. */ -#define E2FSPROGS_VERSION "1.42.9" +#define E2FSPROGS_VERSION "1.43-WIP" - #define E2FSPROGS_DATE "28-Dec-2013" + #define E2FSPROGS_DATE "4-Feb-2014"