--- btrfs-tools-0.19+20100601.orig/debian/btrfs-tools-udeb.install +++ btrfs-tools-0.19+20100601/debian/btrfs-tools-udeb.install @@ -0,0 +1,2 @@ +btrfsctl /sbin +mkfs.btrfs /sbin --- btrfs-tools-0.19+20100601.orig/debian/rules +++ btrfs-tools-0.19+20100601/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +SHELL := sh -e + +%: + dh ${@} --with quilt + +override_dh_auto_build: + CFLAGS="$(CFLAGS)" $(MAKE) all btrfsck btrfstune btrfs-image convert + +override_dh_auto_install: + $(MAKE) DESTDIR=$(CURDIR)/debian/btrfs-tools prefix=/ bindir=/sbin mandir=/usr/share/man install + + # Fixing 'manpage-not-compressed-with-max-compression' + for MANPAGE in $(CURDIR)/debian/btrfs-tools/usr/share/man/*/*.gz; \ + do \ + cd $$(dirname $${MANPAGE}); \ + gunzip $$(basename $${MANPAGE}); \ + done + + # Adding initramfs-tools integration + install -D -m 0755 debian/local/btrfs.hook debian/btrfs-tools/usr/share/initramfs-tools/hooks/btrfs + install -D -m 0755 debian/local/btrfs.local-premount debian/btrfs-tools/usr/share/initramfs-tools/scripts/local-premount/btrfs + install -D -m 0644 debian/local/btrfs.modules debian/btrfs-tools//usr/share/initramfs-tools/modules.d/btrfs + +override_dh_strip: + dh_strip --dbg-package=btrfs-tools-dbg --- btrfs-tools-0.19+20100601.orig/debian/control +++ btrfs-tools-0.19+20100601/debian/control @@ -0,0 +1,45 @@ +Source: btrfs-tools +Section: admin +Priority: optional +Maintainer: Daniel Baumann +Uploaders: Daniel Baumann +Build-Depends: + debhelper (>= 7.0.50~), e2fslibs-dev, libacl1-dev, quilt (>= 0.46-7), uuid-dev, + zlib1g-dev +Standards-Version: 3.8.4 +Homepage: http://btrfs.wiki.kernel.org/ +Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/btrfs-tools.git +Vcs-Git: git://git.debian-maintainers.org/git/daniel/btrfs-tools.git + +Package: btrfs-tools +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Checksumming Copy on Write Filesystem utilities + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains utilities (mkfs, fsck, btrfsctl) used to work with btrfs + and an utility (btrfs-convert) to make a btrfs filesystem from an ext3. + . + WARNING: Btrfs is under heavy development, and is not suitable for any uses + other than benchmarking and review. + +Package: btrfs-tools-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Checksumming Copy on Write Filesystem utilities (udeb) + +Package: btrfs-tools-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${misc:Depends}, btrfs-tools (= ${binary:Version}) +Description: Checksumming Copy on Write Filesystem utilities (debug) + Btrfs is a new copy on write filesystem for Linux aimed at implementing + advanced features while focusing on fault tolerance, repair and easy + administration. + . + This package contains the debugging symbols. --- btrfs-tools-0.19+20100601.orig/debian/README.source +++ btrfs-tools-0.19+20100601/debian/README.source @@ -0,0 +1,37 @@ +Package Repositories +-------------------- + +Backports for the current stable debian distribution as well as snapshots of +unreleased versions may be available in repositories listed on the maintainers +homepage. The current URL of the maintainer homepage can be seen in +debian/copyright. + + +Source Access +------------- + +You can obtain the sources of this package with: + + $ apt-get source ${PACKAGE} + +whereas '${PACKAGE}' has to be replaced with the actual name of the package. + +This package is maintained with the Git version control system. The current git +source tree can be obtained with: + + $ git clone ${GIT_URI} + +whereas '${GIT_URI}' has to be replaced with the actual URI for the Git +repository. The current Git URI can be seen in debian/control in the extracted +package sources. + +More information about Git can be found in the git-core package. + +This package may use the Quilt patch system to manage all modifications to the +upstream source. Changes, if any, are stored in the source package as diffs in +debian/diff and are applied during the build. Current modifications can be +applied to the source tree with: + + $ QUILT_PATCHES=debian/patches quilt push -a + +More information about Quilt can be found in the quilt package. --- btrfs-tools-0.19+20100601.orig/debian/btrfs-tools.install +++ btrfs-tools-0.19+20100601/debian/btrfs-tools.install @@ -0,0 +1,2 @@ +btrfs-image /sbin +btrfstune /sbin --- btrfs-tools-0.19+20100601.orig/debian/copyright +++ btrfs-tools-0.19+20100601/debian/copyright @@ -0,0 +1,91 @@ +Upstream-Contact: Btrfs project +Upstream-Homepage: http://btrfs.wiki.kernel.org/ +Maintainer-Contact: Daniel Baumann +Maintainer-Homepage: http://daniel.debian-maintainers.org/ + +Files: * +Copyright: (C) 2007-2009 Oracle +License: GPL-2+ + This program 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: radix-tree.c +Copyright: + (C) 2007-2009 Oracle + (C) 2001 Momchil Velikov + (C) 2001 Christoph Hellwig + (C) 2005 SGI, Christoph Lameter +License: GPL-2+ + This program 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: radix-tree.h +Copyright: + (C) 2007-2009 Oracle + (C) 2001 Momchil Velikov + (C) 2001 Christoph Hellwig +License: GPL-2+ + This program 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: (C) 2007-2010 Daniel Baumann +License: GPL-2+ + This program 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- btrfs-tools-0.19+20100601.orig/debian/btrfs-tools.README.Debian +++ btrfs-tools-0.19+20100601/debian/btrfs-tools.README.Debian @@ -0,0 +1,7 @@ +btrfs-tools for Debian +---------------------- + +WARNING: Btrfs is under heavy development, and is not suitable for any uses +other than benchmarking and review. + + -- Daniel Baumann Sun, 29 Jul 2007 12:19:00 +0200 --- btrfs-tools-0.19+20100601.orig/debian/changelog +++ btrfs-tools-0.19+20100601/debian/changelog @@ -0,0 +1,255 @@ +btrfs-tools (0.19+20100601-2) unstable; urgency=low + + * Updating ftbfs.patch, thanks to Alexander Kurtz + (Closes: #583768). + * Adding two more casts in ftbfs.patch and fixing wrapping in previous + ones. + + -- Daniel Baumann Sat, 05 Jun 2010 08:50:05 +0200 + +btrfs-tools (0.19+20100601-1) unstable; urgency=low + + * Updating patch to fix FTBFS on alpha and ia64, thanks to Alexander + Kurtz (Closes: #583768). + * Renumbering patches. + * Merging upstream version 0.19+20100601 (Closes: #583793). + * Removing upstream patches. + + -- Daniel Baumann Tue, 01 Jun 2010 07:27:38 +0200 + +btrfs-tools (0.19-12) unstable; urgency=low + + * Setting section for udeb to debian-installer. + * Disabling valgrind patch, seems to make troubles on armel (Closes: + #582438). + + -- Daniel Baumann Mon, 24 May 2010 12:57:36 +0200 + +btrfs-tools (0.19-11) unstable; urgency=low + + * Removing fsck.btrfs symlink to circumvent that btrfsck doesn't + support -a. + * Adding initramfs-tools integration (Closes: #559710). + + -- Daniel Baumann Sun, 04 Apr 2010 17:42:30 +0200 + +btrfs-tools (0.19-10) unstable; urgency=low + + * Updating to standards 3.8.4. + * Including btrfsctl into udeb. + * Adding upstream patches to add support for deleting snapshots and + subvolumes (Closes: #567171). + + -- Daniel Baumann Sat, 06 Feb 2010 08:49:55 +0100 + +btrfs-tools (0.19-9) unstable; urgency=low + + * Adding explicit debian source version 1.0 until switch to 3.0. + * Updating year in copyright file. + * Adding patch from Joey Hess to add btrfs-tools- + udeb (Closes: #567075). + * Adding patch from Joey Hess to improve package + short-descriptions. + + -- Daniel Baumann Wed, 27 Jan 2010 05:31:57 +0100 + +btrfs-tools (0.19-8) unstable; urgency=low + + * Adding patch from Josef Bacik to fix memory + leaks and segfaults. + * Simplifying shell commands in rules. + + -- Daniel Baumann Sat, 05 Dec 2009 17:20:06 +0100 + +btrfs-tools (0.19-7) unstable; urgency=low + + * Moving tools from /usr/bin to /sbin (Closes: #559477). + * Making build-depends on quilt versioned. + * Cosmetically improve shell commands in rules. + * Updating README.source. + + -- Daniel Baumann Fri, 04 Dec 2009 20:54:42 +0100 + +btrfs-tools (0.19-6) unstable; urgency=low + + * Correcting wrong vcs-browser field. + * Updating package long-description (Closes: #552553). + + -- Daniel Baumann Wed, 28 Oct 2009 20:24:25 +0100 + +btrfs-tools (0.19-5) unstable; urgency=low + + * Adding debug package. + + -- Daniel Baumann Fri, 02 Oct 2009 19:40:09 +0200 + +btrfs-tools (0.19-4) unstable; urgency=low + + * Updating maintainer field. + * Updating vcs fields. + * Sorting build-depends and depends. + * Updating package to standards version 3.8.3. + * Bumping versioned build-depends on debhelper. + * Updating years in copyright file. + * Adding README.source. + * Adding maintainer homepage in copyright. + + -- Daniel Baumann Fri, 02 Oct 2009 19:06:02 +0200 + +btrfs-tools (0.19-3) unstable; urgency=low + + * Minimizing rules file. + * Adding patch from Luca Bruno to properly cast and + avoiding compiler warnings. Fixes FTBFS on alpha and ia64 (Closes: + #539433). + + -- Daniel Baumann Sun, 02 Aug 2009 12:08:49 +0200 + +btrfs-tools (0.19-2) unstable; urgency=low + + * Building and installing alternative utilities (Closes: #536058). + * Adding symlink from btrfsck to fsck.btrfs. + * Correcting spelling typo in package long-description. + + -- Daniel Baumann Tue, 07 Jul 2009 14:56:40 +0200 + +btrfs-tools (0.19-1) unstable; urgency=low + + * Merging upstream version 0.19. + * Removing ftbfs.patch, went upstream. + * Updating standards version to 3.8.2. + * Updating rules to cope with new upstream manpage makefiles. + * Workaround upstream makefiles wrt/ manpage compression. + + -- Daniel Baumann Mon, 06 Jul 2009 14:22:03 +0200 + +btrfs-tools (0.18-4) unstable; urgency=low + + * Using correct rfc-2822 date formats in changelog. + * Including btrfs-convert, thanks to Uwe Kleine-König (Closes: #529168). + + -- Daniel Baumann Sun, 17 May 2009 22:18:27 +0200 + +btrfs-tools (0.18-3) unstable; urgency=low + + * Tidy rules file. + * Adding patch from upstream to allow /'s in labels. + + -- Daniel Baumann Fri, 17 Apr 2009 21:02:00 +0200 + +btrfs-tools (0.18-2) unstable; urgency=medium + + * Adding patch from Luca Bruno to fix FTBFS on + alpha and ia64 (Closes: #519913). + * Updating rules file to current state of the art. + * Updating standards version to 3.8.1. + + -- Daniel Baumann Tue, 17 Mar 2009 08:22:00 +0100 + +btrfs-tools (0.18-1) unstable; urgency=low + + * Merging upstream version 0.18. + + -- Daniel Baumann Sat, 24 Jan 2009 15:59:00 +0100 + +btrfs-tools (0.17-1) unstable; urgency=low + + * Updating vcs fields in control file. + * Replacing obsolete dh_clean -k with dh_prep. + * Merging upstream version 0.17. + * Removing notes about not finalized on disk format. + * Prefixing debhelper files with package name. + * Updating year in copyright file. + * Adding zlib to build-depends. + + -- Daniel Baumann Sat, 24 Jan 2009 15:50:00 +0100 + +btrfs-tools (0.16-1) unstable; urgency=low + + * Removing cflags handling in rules, not required anymore. + * Merging upstream version 0.16. + + -- Daniel Baumann Mon, 25 Aug 2008 01:04:00 +0200 + +btrfs-tools (0.15-2) unstable; urgency=medium + + * Building on all architectures again since FTBFS on ia64 is gone. + + -- Daniel Baumann Tue, 01 Jul 2008 15:07:00 +0200 + +btrfs-tools (0.15-1) unstable; urgency=low + + * Merging upstream version 0.15. + * Updating to standards 3.8.0. + + -- Daniel Baumann Mon, 09 Jun 2008 15:01:00 +0200 + +btrfs-tools (0.14-1) unstable; urgency=low + + * Reordering rules file. + * Rewriting copyright file in machine-interpretable format. + * Updated warnings about early state of btrfs. + * Adding vcs fields in control file. + * Updating homepage field in control file. + * Upgrading package to debhelper 7. + * Merging upstream version 0.14. + + -- Daniel Baumann Sun, 04 May 2008 10:04:00 +0200 + +btrfs-tools (0.13-2) unstable; urgency=medium + + * Excluding alpha and ia64 from architectures, doesn't build there + (Closes: #465128). + + -- Daniel Baumann Fri, 07 Mar 2008 12:04:00 +0100 + +btrfs-tools (0.13-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 25 Feb 2008 20:39:00 +0100 + +btrfs-tools (0.12-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Fri, 08 Feb 2008 17:52:00 +0100 + +btrfs-tools (0.11-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 28 Jan 2008 12:58:00 +0100 + +btrfs-tools (0.10-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Thu, 17 Jan 2008 16:23:00 +0100 + +btrfs-tools (0.9-1) unstable; urgency=low + + * New upstream release. + * Updated standards. + * Removing watch file (Closes: #450102). + + -- Daniel Baumann Thu, 20 Dec 2007 08:10:00 +0100 + +btrfs-tools (0.8-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Fri, 14 Sep 2007 11:07:00 +0200 + +btrfs-tools (0.6-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 08 Aug 2007 20:33:00 +0200 + +btrfs-tools (0.5-1) unstable; urgency=low + + * Initial release (Closes: #432697). + + -- Daniel Baumann Sun, 29 Jul 2007 12:19:00 +0200 --- btrfs-tools-0.19+20100601.orig/debian/compat +++ btrfs-tools-0.19+20100601/debian/compat @@ -0,0 +1 @@ +7 --- btrfs-tools-0.19+20100601.orig/debian/local/btrfs.local-premount +++ btrfs-tools-0.19+20100601/debian/local/btrfs.local-premount @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +PREREQ="" + +prereqs() +{ + echo "${PREREQ}" +} + +case "${1}" in + prereqs) + prereqs + exit 0 + ;; +esac + +if [ -x /sbin/btrfsctl ] +then + modprobe btrfs + /sbin/btrfsctl -a 2>/dev/null +fi --- btrfs-tools-0.19+20100601.orig/debian/local/btrfs.hook +++ btrfs-tools-0.19+20100601/debian/local/btrfs.hook @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +PREREQ="" + +prereqs() +{ + echo "${PREREQ}" +} + +case "${1}" in + prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +if [ -x /sbin/btrfsctl ] +then + copy_exec /sbin/btrfsctl /sbin +fi --- btrfs-tools-0.19+20100601.orig/debian/local/btrfs.modules +++ btrfs-tools-0.19+20100601/debian/local/btrfs.modules @@ -0,0 +1,4 @@ +libcrc32c +crc32c +zlib_deflate +btrfs --- btrfs-tools-0.19+20100601.orig/debian/patches/02-ftbfs.patch +++ btrfs-tools-0.19+20100601/debian/patches/02-ftbfs.patch @@ -0,0 +1,123 @@ +Authors: + Luca Bruno + Alexander Kurtz + Daniel Baumann +Description: + Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha + and ia64 (Closes: #539433, #583768). + +diff -Naurp btrfs-tools.orig/btrfsctl.c btrfs-tools/btrfsctl.c +--- btrfs-tools.orig/btrfsctl.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/btrfsctl.c 2010-06-05 08:44:05.000000000 +0200 +@@ -234,7 +234,7 @@ int main(int ac, char **av) + args.fd = fd; + ret = ioctl(snap_fd, command, &args); + } else if (command == BTRFS_IOC_DEFAULT_SUBVOL) { +- printf("objectid is %llu\n", objectid); ++ printf("objectid is %llu\n", (long long unsigned int) objectid); + ret = ioctl(fd, command, &objectid); + } else + ret = ioctl(fd, command, &args); +diff -Naurp btrfs-tools.orig/btrfs-list.c btrfs-tools/btrfs-list.c +--- btrfs-tools.orig/btrfs-list.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/btrfs-list.c 2010-06-05 08:47:27.000000000 +0200 +@@ -248,8 +248,9 @@ static int resolve_root(struct root_look + break; + } + } +- printf("ID %llu top level %llu path %s\n", ri->root_id, top_id, +- full_path); ++ printf("ID %llu top level %llu path %s\n", ++ (long long unsigned int) ri->root_id, ++ (long long unsigned int) top_id, full_path); + free(full_path); + return 0; + } +diff -Naurp btrfs-tools.orig/btrfs-map-logical.c btrfs-tools/btrfs-map-logical.c +--- btrfs-tools.orig/btrfs-map-logical.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/btrfs-map-logical.c 2010-06-05 08:48:10.000000000 +0200 +@@ -65,8 +65,9 @@ struct extent_buffer *debug_read_block(s + eb->dev_bytenr = multi->stripes[0].physical; + + fprintf(info_file, "mirror %d logical %Lu physical %Lu " +- "device %s\n", mirror_num, bytenr, eb->dev_bytenr, +- device->name); ++ "device %s\n", mirror_num, ++ (long long unsigned int) bytenr, ++ (long long unsigned int) eb->dev_bytenr, device->name); + kfree(multi); + + if (!copy || mirror_num == copy) +diff -Naurp btrfs-tools.orig/convert.c btrfs-tools/convert.c +--- btrfs-tools.orig/convert.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/convert.c 2010-06-05 08:43:29.000000000 +0200 +@@ -2572,7 +2572,7 @@ int do_rollback(const char *devname, int + ext2_root = btrfs_read_fs_root(root->fs_info, &key); + if (!ext2_root || IS_ERR(ext2_root)) { + fprintf(stderr, "unable to open subvol %llu\n", +- key.objectid); ++ (unsigned long long) key.objectid); + goto fail; + } + +diff -Naurp btrfs-tools.orig/debug-tree.c btrfs-tools/debug-tree.c +--- btrfs-tools.orig/debug-tree.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/debug-tree.c 2010-06-05 08:46:17.000000000 +0200 +@@ -162,7 +162,8 @@ int main(int ac, char **av) + root->nodesize, 0); + } + if (!leaf) { +- fprintf(stderr, "failed to read %llu\n", block_only); ++ fprintf(stderr, "failed to read %llu\n", ++ (long long unsigned int) block_only); + return 0; + } + btrfs_print_tree(root, leaf, 0); +diff -Naurp btrfs-tools.orig/disk-io.c btrfs-tools/disk-io.c +--- btrfs-tools.orig/disk-io.c 2010-06-01 07:18:01.000000000 +0200 ++++ btrfs-tools/disk-io.c 2010-06-05 08:43:29.000000000 +0200 +@@ -678,7 +678,8 @@ struct btrfs_root *open_ctree_fd(int fp, + ~BTRFS_FEATURE_INCOMPAT_SUPP; + if (features) { + printk("couldn't open because of unsupported " +- "option features (%Lx).\n", features); ++ "option features (%Lx).\n", ++ (unsigned long long)features); + BUG_ON(1); + } + +@@ -692,7 +693,8 @@ struct btrfs_root *open_ctree_fd(int fp, + ~BTRFS_FEATURE_COMPAT_RO_SUPP; + if (writes && features) { + printk("couldn't open RDWR because of unsupported " +- "option features (%Lx).\n", features); ++ "option features (%Lx).\n", ++ (unsigned long long) features); + BUG_ON(1); + } + +diff -Naurp btrfs-tools.orig/extent-tree.c btrfs-tools/extent-tree.c +--- btrfs-tools.orig/extent-tree.c 2010-06-01 07:18:01.000000000 +0200 ++++ btrfs-tools/extent-tree.c 2010-06-05 08:43:29.000000000 +0200 +@@ -1448,7 +1448,8 @@ int btrfs_lookup_extent_info(struct btrf + goto out; + if (ret != 0) { + btrfs_print_leaf(root, path->nodes[0]); +- printk("failed to find block number %Lu\n", bytenr); ++ printk("failed to find block number %Lu\n", ++ (unsigned long long) bytenr); + BUG(); + } + +diff -Naurp btrfs-tools.orig/print-tree.c btrfs-tools/print-tree.c +--- btrfs-tools.orig/print-tree.c 2010-06-01 07:22:33.000000000 +0200 ++++ btrfs-tools/print-tree.c 2010-06-05 08:43:29.000000000 +0200 +@@ -494,7 +494,7 @@ void btrfs_print_leaf(struct btrfs_root + case BTRFS_DIR_LOG_ITEM_KEY: + dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item); + printf("\t\tdir log end %Lu\n", +- btrfs_dir_log_end(l, dlog)); ++ (unsigned long long) btrfs_dir_log_end(l, dlog)); + break; + case BTRFS_ORPHAN_ITEM_KEY: + printf("\t\torphan item\n"); --- btrfs-tools-0.19+20100601.orig/debian/patches/series +++ btrfs-tools-0.19+20100601/debian/patches/series @@ -0,0 +1,2 @@ +01-labels.patch +02-ftbfs.patch --- btrfs-tools-0.19+20100601.orig/debian/patches/01-labels.patch +++ btrfs-tools-0.19+20100601/debian/patches/01-labels.patch @@ -0,0 +1,27 @@ +Author: Chris Mason +Description: Allow /'s in labels. + +diff -Naurp btrfs-tools.orig/mkfs.c btrfs-tools/mkfs.c +--- btrfs-tools.orig/mkfs.c 2009-03-15 13:27:12.000000000 +0100 ++++ btrfs-tools/mkfs.c 2009-04-17 20:53:12.000000000 +0200 +@@ -294,7 +294,6 @@ static u64 parse_profile(char *s) + + static char *parse_label(char *input) + { +- int i; + int len = strlen(input); + + if (len > BTRFS_LABEL_SIZE) { +@@ -302,12 +301,6 @@ static char *parse_label(char *input) + BTRFS_LABEL_SIZE); + exit(1); + } +- for (i = 0; i < len; i++) { +- if (input[i] == '/' || input[i] == '\\') { +- fprintf(stderr, "invalid label %s\n", input); +- exit(1); +- } +- } + return strdup(input); + } + --- btrfs-tools-0.19+20100601.orig/debian/source/format +++ btrfs-tools-0.19+20100601/debian/source/format @@ -0,0 +1 @@ +1.0