Merge branch 'maint' into next

Conflicts:
	debian/changelog
	e2fsck/Makefile.in

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc debian/changelog
index 416774a,c15da38..c2854ee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,23 @@@
 +e2fsprogs (1.43~WIP-2013-12-28-1) unstable; urgency=low
 +
 +  * Add metadata checksum feature
 +
 + -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 28 Dec 2013 23:25:42 -0400
 +
+ e2fsprogs (1.42.9-2) unstable; urgency=low
+ 
+   * Fix lintian warning: debian-changelog-has-wrong-weekday
+   * Fix lintian warning: non-standard-dir-perm by using dh_strip's
+     --dbg-package option instead of manually managing the debug files
+   * Fix printf type format mismatch in e2image
+   * Improved debugfs's error reporting when parsing block numbers
+   * Use consistent configure options across the multiple e2fsprogs
+     builds; this means that e2fsck.static will now use the blkid library
+     shipped with util-linux, instead of the internal one shipped with
+     the e2fsprogs sources.
+ 
+  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 30 Dec 2013 16:56:50 -0500
+ 
  e2fsprogs (1.42.9-1) unstable; urgency=low
  
    * New upstream version

diff --cc debugfs/debugfs.c
Simple merge

diff --cc debugfs/logdump.c
Simple merge

diff --cc e2fsck/Makefile.in
index 6ecfcd9,897bc2b..8ca329b
--- 1/e2fsck/Makefile.in
--- 2/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@@ -142,8 -154,12 +143,8 @@@ tst_problem: $(srcdir)/problem.c $(srcd
        $(DEPLIBCOM_ERR)
        $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \
                $(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) \
-               $(LIBINTL)
+               $(LIBINTL) $(SYSLIBS)
  
 -tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) $(DEPLIBCOM_ERR)
 -      $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
 -              -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) $(SYSLIBS)
 -
  tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR)
        $(E) "  LD $@"
        $(Q) $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
@@@ -157,11 -174,12 +159,11 @@@ tst_logfile: $(srcdir)/logfile.
  tst_region: region.c $(DEPLIBCOM_ERR)
        $(E) "  LD $@"
        $(Q) $(CC) -o tst_region $(srcdir)/region.c \
-               $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
+               $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(SYSLIBS)
  
 -check:: tst_refcount tst_region tst_crc32 tst_problem
 +check:: tst_refcount tst_region tst_problem
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_refcount
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_region
 -      LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_problem
  
  extend: extend.o

diff --cc e2fsck/problem.c
Simple merge

diff --cc lib/config.h.in
Simple merge

diff --cc lib/ext2fs/Makefile.in
Simple merge

diff --cc misc/e2image.c
Simple merge

diff --cc misc/mke2fs.c
Simple merge