Merge branch 'maint' into next

diff --cc Makefile.in
index ddd94ec8dc5bebd65af1b85d95e72eb8bce4990f,745e8590e9ec6044107410d9b545d7d79c76c24b..61f2ebad30a21a2b0bee90b85fbcc2784ce728a8
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -13,11 -13,14 +13,17 @@@ INSTALL = @INSTALL
  @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
  @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
  @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
- SUPPORT_LIB_SUBDIR= lib/support
 +@E2SCRUB_CMT@E2SCRUB_DIR= scrub
 -PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+ @ALL_CMT@SUPPORT_LIB_SUBDIR= lib/support
+ @ALL_CMT@E2P_LIB_SUBDIR= lib/e2p
+ @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
+ 
+ LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+       $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
+ 
- LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
- PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po $(E2SCRUB_DIR)
++PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
++      $(E2SCRUB_DIR)
 +
  SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
  
  SUBS= util/subst.conf lib/config.h $(top_builddir)/lib/dirpaths.h \

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge