merger btrfs to 3.14 and update makefile

Conflicts:
	Makefile.in
	aclocal.m4
	configure
	docs/Makefile.in
	src/Makefile.in
	src/version.h
	tests/Makefile
	tests/Makefile.in

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -82,13 +82,9 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
 	INSTALL NEWS README TODO compile config.guess config.rpath \
-	config.sub depcomp install-sh missing
+	config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -216,6 +212,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -255,6 +252,7 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -264,6 +262,7 @@ UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -609,9 +608,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \

README.Packages/debian.sid/control

@@ -2,7 +2,7 @@ Source: partclone
 Section: admin
 Priority: extra
 Maintainer: Yu-Chin Tsai <[email protected]>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf, autotools-dev, pkg-config, xsltproc, docbook-xsl, docbook-xml, e2fslibs-dev (>= 1.41.3), libbsd-dev, libncursesw5-dev, ntfs-3g-dev|libntfs-dev, libtinfo-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf, autotools-dev, pkg-config, xsltproc, docbook-xsl, docbook-xml, e2fslibs-dev (>= 1.41.3), libbsd-dev, libncursesw5-dev, ntfs-3g-dev|libntfs-dev, libtinfo-dev, libblkid-dev
 Standards-Version: 3.9.3
 
 Package: partclone

README.Packages/debian.squeeze/control

@@ -2,7 +2,7 @@ Source: partclone
 Section: admin
 Priority: extra
 Maintainer: Yu-Chin Tsai <[email protected]>, Jazz Yao-Tsung Wang <[email protected]>
-Build-Depends: debhelper (>= 5), autotools-dev, e2fslibs-dev (>= 1.41.3), xfslibs-dev, libreiserfs0.3-dev, libreiser4-dev, libufs2 (>= 7.2), libbsd-dev, libncursesw5-dev, ntfs-3g-dev|libntfs-dev, libvmfs (>= 0.2.5), libjfs-dev, pkg-config, xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 5), autotools-dev, e2fslibs-dev (>= 1.41.3), xfslibs-dev, libreiserfs0.3-dev, libreiser4-dev, libufs2 (>= 7.2), libbsd-dev, libncursesw5-dev, ntfs-3g-dev|libntfs-dev, libvmfs (>= 0.2.5), libjfs-dev, pkg-config, xsltproc, docbook-xsl, libblkid-dev
 Standards-Version: 3.7.2
 
 Package: partclone