Merge lp:~vibhavp/ubuntu/saucy/aufs-tools/merge-from-debian into lp:ubuntu/saucy/aufs-tools

[Vibhav Pant]

[Bhavani Shankar (bhavi)]

Hi Vibhav,

It fails to build for me on my i386 saucy pbuilder

gpgv: Signature made Wed May 1 08:43:45 2013 UTC using RSA key ID 2E303A1E
gpgv: Can't check signature: public key not found
dpkg-source: warning: failed to verify signature on ./aufs-tools_3.0+20130111-3ubuntu1.dsc
dpkg-source: info: extracting aufs-tools in aufs-tools-3.0+20130111
dpkg-source: info: unpacking aufs-tools_3.0+20130111.orig.tar.xz
dpkg-source: info: unpacking aufs-tools_3.0+20130111-3ubuntu1.debian.tar.xz
dpkg-source: info: applying fix-ftbfs-with-rc-kernel.patch
dpkg-source: info: applying 0001-static.patch
dpkg-source: info: applying 0002-manpage.patch
dpkg-source: info: applying 0003-shebang.patch
I: Building the package
I: Running cd tmp/buildd/*/ && env PATH="/usr/lib/ccache:/usr/sbin:/usr/bin:/sbin:/bin" dpkg-buildpackage -us -uc -rfakeroot
dpkg-buildpackage: source package aufs-tools
dpkg-buildpackage: source version 1:3.0+20130111-3ubuntu1
dpkg-buildpackage: source changed by Vibhav Pant <email address hidden>
dpkg-buildpackage: host architecture i386
 dpkg-source --before-build aufs-tools-3.0+20130111
dpkg-source: info: using options from aufs-tools-3.0+20130111/debian/source/options: --compression=xz
 fakeroot debian/rules clean
dh clean
   dh_testdir
   dh_auto_clean
make[1]: Entering directory `/tmp/buildd/aufs-tools-3.0+20130111'
rm -f aufs.5 auibusy auplink mount.aufs umount.aufs etc_default_aufs libautil.a libau.so* *~
rm -f auibusy.o auplink.o mount.aufs.o umount.aufs.o proc_mnt.o br.o plink.o mtab.o
make -C libau clean
make[2]: Entering directory `/tmp/buildd/aufs-tools-3.0+20130111/libau'
rm -f libau.so libau.so.* libau.o rdu_lib.o rdu.o rdu64.o pathconf.o *~
test -L rdu64.c && rm -f rdu64.c || :
make[2]: Leaving directory `/tmp/buildd/aufs-tools-3.0+20130111/libau'
make[1]: Leaving directory `/tmp/buildd/aufs-tools-3.0+20130111'
   dh_clean
 dpkg-source -b aufs-tools-3.0+20130111
dpkg-source: info: using options from aufs-tools-3.0+20130111/debian/source/options: --compression=xz
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building aufs-tools using existing ./aufs-tools_3.0+20130111.orig.tar.xz
dpkg-source: info: building aufs-tools in aufs-tools_3.0+20130111-3ubuntu1.debian.tar.xz
dpkg-source: info: building aufs-tools in aufs-tools_3.0+20130111-3ubuntu1.dsc
 debian/rules build
dh build
   dh_testdir
   dh_auto_configure
   dh_auto_build
make[1]: Entering directory `/tmp/buildd/aufs-tools-3.0+20130111'
cc -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -I./libau -O -Wall -D_FORTIFY_SOURCE=2 -DMOUNT_CMD_PATH=\"\" -Wl,-Bsymbolic-functions -Wl,-z,relro ver.c -o ver
In file included from ver.c:19:0:
/usr/include/linux/aufs_type.h:19:34: fatal error: uapi/linux/aufs_type.h: No such file or directory
 #include <uapi/linux/aufs_type.h>
                                  ^
compilation terminated.
make[1]: *** [ver] Error 1
make[1]: Leaving directory `/tmp/buildd/aufs-tools-3.0+20130111'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
I: unmounting /var/cache/pbu...

review: Needs Information

Unmerged revisions

13. By Vibhav Pant on 2013-05-01

* Merge from Debian unstable. Remaining changes:
  - Build for both 3.x-rcN & 3.0+ kernels. Fixes FTBFS.
* Taking over with maintainer's consent.
* Removing all references to my old email address.
* Merging upstream version 3.0+20130111.
* Prefixing patches with four digits.
* Updating year in copyright file.
* Setting shebang for the time being to bash in included shell scripts
  (Closes: #701552).
* Trimming diff header in static.patch.
* Correcting manpage example syntax, thanks to Dan Greene <dan-
  <email address hidden>> (Closes: #700111).
* Dropping dpkg-source compression levels.
* Updating year in copyright file.

12. By Vibhav Pant on 2013-05-01

Merging shared upstream rev into target branch.

=== removed directory '.pc/01-static.patch'
=== removed file '.pc/01-static.patch/Makefile'
--- .pc/01-static.patch/Makefile	2012-05-18 13:17:14 +0000
+++ .pc/01-static.patch/Makefile	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-
-# Copyright (C) 2005-2011 Junjiro R. Okajima
-#
-# This program, aufs is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301	 USA
-
-HOSTCC ?= cc
-CFLAGS += -I./libau
-CFLAGS += -O -Wall
-
-# MountCmdPath: dirty trick to support local nfs-mount.
-# - on a single host, mount aufs, export it via nfs, and mount it again
-#   via nfs locally.
-# in this situation, a deadlock MAY happen between the aufs branch
-# management and nfsd.
-# - mount.aufs enters the pseudo-link maintenance mode which prohibits
-#   all processes acess to the aufs mount except its children.
-# - mount.aufs calls execvp(3) to execute mount(8).
-# - then nfsd MAY searches mount(8) under the nfs-mounted aufs which is
-#   already prohibited.
-# the search behaviour is highly depending upon the system environment,
-# but if we specify the path of mount(8) we can keep it from the
-# deadlock.
-
-ifdef MountCmdPath
-override CPPFLAGS += -DMOUNT_CMD_PATH=\"${MountCmdPath}/\"
-else
-override CPPFLAGS += -DMOUNT_CMD_PATH=\"\"
-endif
-
-Cmd = aubusy auchk aubrsync
-Man = aufs.5
-Etc = etc_default_aufs
-Bin = auibusy auplink mount.aufs umount.aufs #auctl
-BinObj = $(addsuffix .o, ${Bin})
-LibUtil = libautil.a
-LibUtilObj = proc_mnt.o br.o plink.o mtab.o
-LibUtilHdr = au_util.h
-export
-
-all: ver_test ${Man} ${Bin} ${Etc}
-	${MAKE} -C libau $@
-	ln -sf ./libau/libau*.so .
-
-ver_test: ver
-	./ver
-
-${Bin}: LDFLAGS += -static -s
-${Bin}: LDLIBS = -L. -lautil
-${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
-
-${LibUtilObj}: %.o: %.c ${LibUtilHdr}
-#${LibUtil}: ${LibUtil}(${LibUtilObj})
-${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o}))
-.NOTPARALLEL: ${LibUtil}
-
-etc_default_aufs: c2sh aufs.shlib
-	${RM} $@
-	echo '# aufs variables for shell scripts' > $@
-	./c2sh >> $@
-	echo >> $@
-	sed -e '0,/^$$/d' aufs.shlib >> $@
-
-aufs.5: aufs.in.5 c2tmac
-	${RM} $@
-	./c2tmac > $@
-	awk '{ \
-		gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \
-		gsub(/\\\[oq\]\140/, "\\[oq]"); \
-		gsub(/\047\\\[cq\]/, "\\[cq]"); \
-		gsub(/\047/, "\\[aq]"); \
-		print; \
-	}' aufs.in.5 >> $@
-	chmod a-w $@
-
-c2sh c2tmac ver: CC = ${HOSTCC}
-.INTERMEDIATE: c2sh c2tmac ver
-
-Install = install -o root -g root -p
-install_sbin: File = auibusy auplink mount.aufs umount.aufs
-install_sbin: Tgt = ${DESTDIR}/sbin
-install_ubin: File = aubusy auchk aubrsync #auctl
-install_ubin: Tgt = ${DESTDIR}/usr/bin
-install_sbin install_ubin: ${File}
-	install -d ${Tgt}
-	${Install} -m 755 ${File} ${Tgt}
-install_etc: File = etc_default_aufs
-install_etc: Tgt = ${DESTDIR}/etc/default/aufs
-install_etc: ${File}
-	install -d $(dir ${Tgt})
-	${Install} -m 644 -T ${File} ${Tgt}
-install_man: File = aufs.5
-install_man: Tgt = ${DESTDIR}/usr/share/man/man5
-install_man: ${File}
-	install -d ${Tgt}
-	${Install} -m 644 ${File} ${Tgt}
-install_ulib:
-	${MAKE} -C libau $@
-
-install: install_man install_sbin install_ubin install_etc install_ulib
-
-clean:
-	${RM} ${Man} ${Bin} ${Etc} ${LibUtil} libau.so* *~
-	${RM} ${BinObj} ${LibUtilObj}
-	${MAKE} -C libau $@
-
--include priv.mk

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-12-31 16:52:55 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01-static.patch
-fix-ftbfs-with-rc-kernel.patch

=== removed directory '.pc/fix-ftbfs-with-rc-kernel.patch'
=== removed file '.pc/fix-ftbfs-with-rc-kernel.patch/ver.c'
--- .pc/fix-ftbfs-with-rc-kernel.patch/ver.c	2012-12-31 16:52:55 +0000
+++ .pc/fix-ftbfs-with-rc-kernel.patch/ver.c	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2011 Junjiro R. Okajima
- *
- * This program, aufs is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/aufs_type.h>
-#include <regex.h>
-#include <stdio.h>
-#include <string.h>
-#include "au_util.h"
-
-int main(int argc, char *argv[])
-{
-	regex_t preg;
-	const char *pat = "^3\\.[0-9](-|$)";
-
-	if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB))
-		AuFin("regcomp");
-
-	if (!regexec(&preg, AUFS_VERSION, 0, NULL, 0))
-		return 0;
-
-	puts("Wrong version!\n"
-	     AuVersion ", but aufs is " AUFS_VERSION ".");
-	return -1;
-}

=== modified file 'Makefile'
--- Makefile	2012-05-18 13:17:14 +0000
+++ Makefile	2013-05-01 06:49:31 +0000
@@ -56,6 +56,7 @@
 ver_test: ver
 	./ver
 
+${Bin}: LDFLAGS += -static -s
 ${Bin}: LDLIBS = -L. -lautil
 ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
 

=== modified file 'aufs.in.5'
--- aufs.in.5	2012-05-18 13:17:14 +0000
+++ aufs.in.5	2013-05-01 06:49:31 +0000
@@ -685,6 +685,15 @@
 This is the current limitation of aufs.
 On 64bit environment, this limitation becomes more strict and the
 supported largest inode number is less than LLONG_MAX/8\-1.
+In order to estimate the size of the table for your readonly branch fs,
+try
+
+.nf
+$ echo $((4 * $(sudo find /branch_fs -xdev -printf "%i\\n" |
+	sort -n | tail -n 1)))
+.fi
+
+For 64bit environment, replace 4 by 8 in above equation.
 
 The xino files are always hidden, i.e. removed. So you cannot
 do `ls \-l xino_file'.
@@ -737,6 +746,17 @@
 You can truncate it anytime you like if you specify `trunc_xib' mount
 option. But when the accessed inode number was not deleted, nothing
 will be truncated.
+The truncation is essentially equivalent to
+
+.nf
+$ cp --sparse=always <current xino file> <new xino file> &&
+	rm <current xino file>
+.fi
+
+It means that you have two xino files during the copy, and you should
+pay attention to the free space of the filesystem where the xino file is
+located.
+
 If you do not want to truncate it (it may be slow) when you delete a
 branch, specify `notrunc_xib' after `del' mount option.
 For the table, see trunc_xino_path=BRANCH, itrunc_xino=INDEX, trunc_xino

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-31 16:52:55 +0000
+++ debian/changelog	2013-05-01 06:49:31 +0000
@@ -1,3 +1,42 @@
+aufs-tools (1:3.0+20130111-3ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Build for both 3.x-rcN & 3.0+ kernels. Fixes FTBFS.
+
+ -- Vibhav Pant <[e-mail]>  Wed, 01 May 2013 12:13:05 +0530
+
+aufs-tools (1:3.0+20130111-3) unstable; urgency=low
+
+  * Taking over with maintainer's consent.
+
+ -- Luk Claes <[e-mail]>  Sat, 20 Apr 2013 18:24:07 +0200
+
+aufs-tools (1:3.0+20130111-2) unstable; urgency=low
+
+  * Removing all references to my old email address.
+
+ -- Daniel Baumann <[e-mail]>  Sun, 10 Mar 2013 19:50:11 +0100
+
+aufs-tools (1:3.0+20130111-1) unstable; urgency=low
+
+  * Merging upstream version 3.0+20130111.
+  * Prefixing patches with four digits.
+  * Updating year in copyright file.
+  * Setting shebang for the time being to bash in included shell scripts
+    (Closes: #701552).
+
+ -- Daniel Baumann <[e-mail]>  Tue, 26 Feb 2013 11:57:59 +0100
+
+aufs-tools (1:3.0+20120411-4) unstable; urgency=low
+
+  * Trimming diff header in static.patch.
+  * Correcting manpage example syntax, thanks to Dan Greene <dan-
+    [e-mail]> (Closes: #700111).
+  * Dropping dpkg-source compression levels.
+  * Updating year in copyright file.
+
+ -- Daniel Baumann <[e-mail]>  Sat, 09 Feb 2013 08:02:05 +0100
+
 aufs-tools (1:3.0+20120411-3ubuntu1) raring; urgency=low
 
   * Build for both 3.x-rcN & 3.0+ kernels. Fixes FTBFS.
@@ -10,7 +49,7 @@
   * Updating to standards version 3.9.4.
   * Making build-depends on linux-libc-dev unversioned again for jessie.
 
- -- Daniel Baumann <[e-mail]>  Tue, 11 Dec 2012 21:14:26 +0100
+ -- Daniel Baumann <[e-mail]>  Tue, 11 Dec 2012 21:14:26 +0100
 
 aufs-tools (1:3.0+20120411-2) unstable; urgency=low
 
@@ -18,7 +57,7 @@
   * Trimming lintian overrides.
   * Switching to xz compression.
 
- -- Daniel Baumann <[e-mail]>  Fri, 29 Jun 2012 03:32:01 +0200
+ -- Daniel Baumann <[e-mail]>  Fri, 29 Jun 2012 03:32:01 +0200
 
 aufs-tools (1:3.0+20120411-1) unstable; urgency=low
 
@@ -27,14 +66,14 @@
   * Updating copyright file to machine-readable format version 1.0.
   * Merging upstream version 3.0+20120411.
 
- -- Daniel Baumann <[e-mail]>  Fri, 18 May 2012 13:17:14 +0200
+ -- Daniel Baumann <[e-mail]>  Fri, 18 May 2012 13:17:14 +0200
 
 aufs-tools (1:3.0+20111101-1) unstable; urgency=low
 
   * Merging upstream version 3.0+20111101.
   * Updating build-depends to linux-libc-dev (Closes: #649051).
 
- -- Daniel Baumann <[e-mail]>  Sat, 10 Dec 2011 10:17:51 +0100
+ -- Daniel Baumann <[e-mail]>  Sat, 10 Dec 2011 10:17:51 +0100
 
 aufs-tools (1:3.0+20111022-1) unstable; urgency=low
 
@@ -45,7 +84,7 @@
   * Sorting overrides in rules alphabetically.
   * Updating lintian overrides.
 
- -- Daniel Baumann <[e-mail]>  Thu, 03 Nov 2011 10:04:55 +0100
+ -- Daniel Baumann <[e-mail]>  Thu, 03 Nov 2011 10:04:55 +0100
 
 aufs-tools (20110410-1) unstable; urgency=low
 
@@ -64,20 +103,20 @@
   * Adding manpage symlinks for aubusy and auibusy.
   * Updating lintian overrides.
 
- -- Daniel Baumann <[e-mail]>  Sun, 28 Aug 2011 00:22:02 +0200
+ -- Daniel Baumann <[e-mail]>  Sun, 28 Aug 2011 00:22:02 +0200
 
 aufs-tools (20100901-2) experimental; urgency=low
 
   * Updating to debhelper version 8.
   * Switching to source format 3.0 (quilt).
 
- -- Daniel Baumann <[e-mail]>  Fri, 26 Nov 2010 17:30:56 +0100
+ -- Daniel Baumann <[e-mail]>  Fri, 26 Nov 2010 17:30:56 +0100
 
 aufs-tools (20100901-1) experimental; urgency=low
 
   * Merging upstream version 20100901.
 
- -- Daniel Baumann <[e-mail]>  Wed, 01 Sep 2010 09:41:49 +0200
+ -- Daniel Baumann <[e-mail]>  Wed, 01 Sep 2010 09:41:49 +0200
 
 aufs-tools (20100801-1) experimental; urgency=low
 
@@ -85,33 +124,33 @@
   * Merging upstream version 20100801.
   * Updating standards version to 3.9.1.
 
- -- Daniel Baumann <[e-mail]>  Sat, 14 Aug 2010 13:51:36 +0200
+ -- Daniel Baumann <[e-mail]>  Sat, 14 Aug 2010 13:51:36 +0200
 
 aufs-tools (20100601-1) unstable; urgency=low
 
   * Merging upstream version 20100601.
 
- -- Daniel Baumann <[e-mail]>  Tue, 01 Jun 2010 07:00:25 +0200
+ -- Daniel Baumann <[e-mail]>  Tue, 01 Jun 2010 07:00:25 +0200
 
 aufs-tools (20100501-1) unstable; urgency=low
 
   * Merging upstream version 20100501.
   * Updating rules file for new upstream version.
 
- -- Daniel Baumann <[e-mail]>  Sat, 01 May 2010 05:16:04 +0200
+ -- Daniel Baumann <[e-mail]>  Sat, 01 May 2010 05:16:04 +0200
 
 aufs-tools (20100401-1) unstable; urgency=low
 
   * Merging upstream version 20100401.
 
- -- Daniel Baumann <[e-mail]>  Fri, 02 Apr 2010 09:06:19 +0200
+ -- Daniel Baumann <[e-mail]>  Fri, 02 Apr 2010 09:06:19 +0200
 
 aufs-tools (20100301-1) unstable; urgency=low
 
   * Merging upstream version 20100301.
   * Sorting dh call in rules to more common order.
 
- -- Daniel Baumann <[e-mail]>  Fri, 12 Mar 2010 18:02:27 +0100
+ -- Daniel Baumann <[e-mail]>  Fri, 12 Mar 2010 18:02:27 +0100
 
 aufs-tools (20100201-1) unstable; urgency=low
 
@@ -120,10 +159,10 @@
   * Merging upstream version 20100201.
   * Updating year in copyright file.
 
- -- Daniel Baumann <[e-mail]>  Mon, 01 Feb 2010 12:48:24 +0100
+ -- Daniel Baumann <[e-mail]>  Mon, 01 Feb 2010 12:48:24 +0100
 
 aufs-tools (20100101-1) unstable; urgency=low
 
   * Initial release.
 
- -- Daniel Baumann <[e-mail]>  Sun, 27 Dec 2009 11:14:34 +0100
+ -- Daniel Baumann <[e-mail]>  Sun, 27 Dec 2009 11:14:34 +0100

=== modified file 'debian/control'
--- debian/control	2012-12-31 16:52:55 +0000
+++ debian/control	2013-05-01 06:49:31 +0000
@@ -2,7 +2,8 @@
 Section: kernel
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Daniel Baumann <[e-mail]>
+XSBC-Original-Maintainer: Filesystems Group <[e-mail]>
+Uploaders: Luk Claes <[e-mail]>
 Build-Depends: debhelper (>= 9), linux-libc-dev
 Standards-Version: 3.9.4
 Homepage: http://aufs.sourceforge.net/

=== modified file 'debian/copyright'
--- debian/copyright	2012-06-29 03:32:01 +0000
+++ debian/copyright	2013-05-01 06:49:31 +0000
@@ -4,11 +4,11 @@
 Source: http://aufs.git.sourceforge.net/git/gitweb.cgi?p=aufs/aufs-util.git
 
 Files: *
-Copyright: 2005-2012 Junjiro R. Okajima
+Copyright: 2005-2013 Junjiro R. Okajima
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2009-2012 Daniel Baumann <[e-mail]>
+Copyright: 2009-2013 Daniel Baumann <[e-mail]>
 License: GPL-2+
 
 License: GPL-2+

=== added file 'debian/patches/0001-static.patch'
--- debian/patches/0001-static.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-static.patch	2013-05-01 06:49:31 +0000
@@ -0,0 +1,14 @@
+Author: Daniel Baumann <[e-mail]>
+Description: Don't build static linked binaries.
+
+diff -Naurp aufs-tools.orig/Makefile aufs-tools/Makefile
+--- aufs-tools.orig/Makefile
++++ aufs-tools/Makefile
+@@ -55,7 +55,6 @@ all: ver_test ${Man} ${Bin} ${Etc}
+ ver_test: ver
+ 	./ver
+ 
+-${Bin}: LDFLAGS += -static -s
+ ${Bin}: LDLIBS = -L. -lautil
+ ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
+ 

=== added file 'debian/patches/0002-manpage.patch'
--- debian/patches/0002-manpage.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-manpage.patch	2013-05-01 06:49:31 +0000
@@ -0,0 +1,26 @@
+Author: Daniel Baumann <[e-mail]>
+Description:
+ Correcting example syntax, thanks to Dan Greene <[e-mail]>
+ (Closes: #700111).
+
+diff -Naurp aufs-tools.orig/aufs.in.5 aufs-tools/aufs.in.5
+--- aufs-tools.orig/aufs.in.5
++++ aufs-tools/aufs.in.5
+@@ -1769,7 +1769,7 @@ shows how the options are handled. (assu
+ installed)
+ 
+ .nf
+-# mount -v -t aufs br:/day0:/base none /u
++# mount -v -t aufs -o br:/day0:/base none /u
+ none on /u type aufs (rw,xino=/day0/.aufs.xino,br:/day0=rw:/base=ro)
+ # mount -v -o remount,\\
+ 	prepend:/day1,\\
+@@ -1781,7 +1781,7 @@ none on /u type aufs (rw,xino=/day1/xino
+ .fi
+ 
+ .nf
+-# mount -t aufs br:/rw none /u
++# mount -t aufs -o br:/rw none /u
+ # mount -o remount,append:/ro /u
+ different uid/gid/permission, /ro
+ # mount -o remount,del:/ro /u

=== added file 'debian/patches/0003-shebang.patch'
--- debian/patches/0003-shebang.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-shebang.patch	2013-05-01 06:49:31 +0000
@@ -0,0 +1,27 @@
+diff -Naurp aufs-tools.orig/aubrsync aufs-tools/aubrsync
+--- aufs-tools.orig/aubrsync
++++ aufs-tools/aubrsync
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Copyright (C) 2005-2011 Junjiro R. Okajima
+ #
+diff -Naurp aufs-tools.orig/aubusy aufs-tools/aubusy
+--- aufs-tools.orig/aubusy
++++ aufs-tools/aubusy
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # Copyright (C) 2011 Junjiro R. Okajima
+ #
+diff -Naurp aufs-tools.orig/auchk aufs-tools/auchk
+--- aufs-tools.orig/auchk
++++ aufs-tools/auchk
+@@ -1,4 +1,4 @@
+-#!/bin/sh -
++#!/bin/bash
+ 
+ # Copyright (C) 2005-2011 Junjiro R. Okajima
+ #

=== removed file 'debian/patches/01-static.patch'
--- debian/patches/01-static.patch	2011-08-28 00:22:02 +0000
+++ debian/patches/01-static.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Author: Daniel Baumann <[e-mail]>
-Description: Don't build static linked binaries.
-
-diff -Naurp aufs-tools.orig/Makefile aufs-tools/Makefile
---- aufs-tools.orig/Makefile	2011-08-28 00:11:10.954083160 +0200
-+++ aufs-tools/Makefile	2011-08-28 00:12:41.178530561 +0200
-@@ -55,7 +55,6 @@ all: ver_test ${Man} ${Bin} ${Etc}
- ver_test: ver
- 	./ver
- 
--${Bin}: LDFLAGS += -static -s
- ${Bin}: LDLIBS = -L. -lautil
- ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-12-31 16:52:55 +0000
+++ debian/patches/series	2013-05-01 06:49:31 +0000
@@ -1,2 +1,4 @@
-01-static.patch
-fix-ftbfs-with-rc-kernel.patch
+0001-static.patch
+0002-manpage.patch
+0003-shebang.patch
+fix-ftbfs-with-rc-kernel.patch
\ No newline at end of file

=== modified file 'debian/rules'
--- debian/rules	2012-06-29 03:32:01 +0000
+++ debian/rules	2013-05-01 06:49:31 +0000
@@ -7,7 +7,7 @@
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/aufs-tools
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
 
 override_dh_strip:
 	dh_strip --dbg-package=aufs-tools-dbg

=== modified file 'debian/source/options'
--- debian/source/options	2012-06-29 03:32:01 +0000
+++ debian/source/options	2013-05-01 06:49:31 +0000
@@ -1,2 +1,1 @@
 compression = xz
-compression-level = 9

=== modified file 'ver.c'
--- ver.c	2012-12-31 16:52:55 +0000
+++ ver.c	2013-05-01 06:49:31 +0000
@@ -25,7 +25,7 @@
 int main(int argc, char *argv[])
 {
 	regex_t preg;
-	const char *pat = "^3\\.[0-9x](-|$)";
+	const char *pat = "^3\\.[0-9](-|$)";
 
 	if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB))
 		AuFin("regcomp");