Package: btrfs-tools
Version: 0.19+20130315-5
Severity: wishlist
Tags: patch

Dear Maintainer,

a recent btrfsck is needed when having data corruption with btrfs, so please 
upgrade btrfs-tools to the latest upstream version.

You'll find a patch with this modifications :
- 02-ftbfs.patch is no longer needed
- calc-size was renamed upstream in btrfs-calc-size
- btrfsctl doesn't exists anymore

thanks,
Olivier

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.9-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) (ignored: LC_ALL 
set to fr_FR.utf8)
Shell: /bin/sh linked to /bin/dash

Versions of packages btrfs-tools depends on:
ii  e2fslibs    1.42.8-1
ii  libblkid1   2.20.1-5.5
ii  libc6       2.17-92
ii  libcomerr2  1.42.8-1
ii  liblzo2-2   2.06-1
ii  libuuid1    2.20.1-5.5
ii  zlib1g      1:1.2.8.dfsg-1

btrfs-tools recommends no packages.

btrfs-tools suggests no packages.

-- no debconf information
diff -Naurp btrfs-tools-0.19+20130315/debian/btrfs-tools.install btrfs-tools/debian/btrfs-tools.install
--- btrfs-tools-0.19+20130315/debian/btrfs-tools.install	2013-07-31 15:49:41.000000000 +0200
+++ btrfs-tools/debian/btrfs-tools.install	2013-08-26 11:49:07.551971856 +0200
@@ -1,4 +1,4 @@
 btrfs-select-super	/sbin
-calc-size		/sbin
+btrfs-calc-size		/sbin
 ioctl.h			/usr/include/btrfs
-debian/local/fsck.btrfs /sbin
\ Pas de fin de ligne à la fin du fichier
+debian/local/fsck.btrfs /sbin
diff -Naurp btrfs-tools-0.19+20130315/debian/btrfs-tools-udeb.install btrfs-tools/debian/btrfs-tools-udeb.install
--- btrfs-tools-0.19+20130315/debian/btrfs-tools-udeb.install	2013-05-15 09:43:04.000000000 +0200
+++ btrfs-tools/debian/btrfs-tools-udeb.install	2013-08-26 11:51:00.092763011 +0200
@@ -1,3 +1,2 @@
 btrfs		/sbin
-btrfsctl	/sbin
 mkfs.btrfs	/sbin
diff -Naurp btrfs-tools-0.19+20130315/debian/changelog btrfs-tools/debian/changelog
--- btrfs-tools-0.19+20130315/debian/changelog	2013-07-31 15:56:29.000000000 +0200
+++ btrfs-tools/debian/changelog	2013-08-26 11:19:06.675279043 +0200
@@ -1,3 +1,9 @@
+btrfs-tools (0.20-rc1-358-g194aa4a) wheezy; urgency=low
+
+  * Non-maintainer upload.
+
+ -- Daevel SARL <[email protected]>  Mon, 26 Aug 2013 11:17:52 +0200
+
 btrfs-tools (0.19+20130315-5) unstable; urgency=low
 
   * Provide "proper" fsck.btrfs, similar in spirit to fsck.xfs, that
diff -Naurp btrfs-tools-0.19+20130315/debian/control btrfs-tools/debian/control
--- btrfs-tools-0.19+20130315/debian/control	2013-07-23 23:33:13.000000000 +0200
+++ btrfs-tools/debian/control	2013-08-26 11:51:08.104819964 +0200
@@ -15,7 +15,7 @@ Description: Checksumming Copy on Write
  advanced features while focusing on fault tolerance, repair and easy
  administration.
  .
- This package contains utilities (mkfs, fsck, btrfsctl) used to work with btrfs
+ This package contains utilities (mkfs, fsck) used to work with btrfs
  and an utility (btrfs-convert) to make a btrfs filesystem from an ext3.
 
 Package: btrfs-tools-udeb
diff -Naurp btrfs-tools-0.19+20130315/debian/patches/02-ftbfs.patch btrfs-tools/debian/patches/02-ftbfs.patch
--- btrfs-tools-0.19+20130315/debian/patches/02-ftbfs.patch	2013-05-15 09:43:04.000000000 +0200
+++ btrfs-tools/debian/patches/02-ftbfs.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Authors:
- Luca Bruno <[email protected]>
- Alexander Kurtz <[email protected]>
- Daniel Baumann <[email protected]>
-Description:
- Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha
- and ia64 (Closes: #539433, #583768).
-
-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
-@@ -2518,7 +2518,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-0.19+20130315/debian/patches/03-manpage.patch btrfs-tools/debian/patches/03-manpage.patch
--- btrfs-tools-0.19+20130315/debian/patches/03-manpage.patch	2013-05-15 09:43:04.000000000 +0200
+++ btrfs-tools/debian/patches/03-manpage.patch	2013-08-26 11:32:20.008865750 +0200
@@ -27,40 +27,16 @@ diff -Naurp btrfs-tools.orig/man/btrfsck
  and not suitable for any uses other than benchmarking and review.
  Please refer to the btrfs wiki http://btrfs.wiki.kernel.org for
  further details.
-diff -Naurp btrfs-tools.orig/man/btrfsctl.8.in btrfs-tools/man/btrfsctl.8.in
---- btrfs-tools.orig/man/btrfsctl.8.in	2010-10-02 11:59:27.288223493 +0200
-+++ btrfs-tools/man/btrfsctl.8.in	2010-10-04 21:21:32.900128594 +0200
-@@ -40,7 +40,7 @@ Scans all devices present in the system
- Forces a filesystem sync.
- .SH AVAILABILITY
- .B btrfsctl
--is part of btrfs-progs. Btrfs is currently under heavy development,
-+is part of btrfs-tools. Btrfs is currently under heavy development,
- and not suitable for any uses other than benchmarking and review.
- Please refer to the btrfs wiki http://btrfs.wiki.kernel.org for
- further details.
 diff -Naurp btrfs-tools.orig/man/btrfs-image.8.in btrfs-tools/man/btrfs-image.8.in
 --- btrfs-tools.orig/man/btrfs-image.8.in	2010-10-02 11:59:27.288223493 +0200
 +++ btrfs-tools/man/btrfs-image.8.in	2010-10-04 21:21:35.280121306 +0200
-@@ -26,7 +26,7 @@ compression level (0 ~ 9).
- number of threads (1 ~ 32) to be used to process the image dump or restore.
+@@ -44,7 +44,7 @@ option if your extent tree is corrupted
+ captured.
  .SH AVAILABILITY
  .B btrfs-image
 -is part of btrfs-progs. Btrfs is currently under heavy development,
 +is part of btrfs-tools. Btrfs is currently under heavy development,
  and not suitable for any uses other than benchmarking and review.
- Please refer to the btrfs wiki
- http://btrfs.wiki.kernel.org for further details.
-diff -Naurp btrfs-tools.orig/man/btrfs-show.8.in btrfs-tools/man/btrfs-show.8.in
---- btrfs-tools.orig/man/btrfs-show.8.in	2010-10-02 11:59:27.288223493 +0200
-+++ btrfs-tools/man/btrfs-show.8.in	2010-10-04 21:21:37.068067824 +0200
-@@ -14,7 +14,7 @@ information such as lable, uuid, etc of
- none
- .SH AVAILABILITY
- .B btrfs-show
--is part of btrfs-progs. Btrfs is currently under heavy development,
-+is part of btrfs-tools. Btrfs is currently under heavy development,
- and not suitable for any uses other than benchmarking and review.
  Please refer to the btrfs wiki
  http://btrfs.wiki.kernel.org for further details.
 diff -Naurp btrfs-tools.orig/man/mkfs.btrfs.8.in btrfs-tools/man/mkfs.btrfs.8.in
diff -Naurp btrfs-tools-0.19+20130315/debian/patches/10-soname.patch btrfs-tools/debian/patches/10-soname.patch
--- btrfs-tools-0.19+20130315/debian/patches/10-soname.patch	2013-05-16 17:25:58.000000000 +0200
+++ btrfs-tools/debian/patches/10-soname.patch	2013-08-26 11:40:20.000248816 +0200
@@ -4,12 +4,12 @@ Description: Setting soname for libbtrfs
 diff -Naurp btrfs-tools.orig/Makefile btrfs-tools/Makefile
 --- btrfs-tools.orig/Makefile	2013-05-16 13:05:40.967941936 +0200
 +++ btrfs-tools/Makefile	2013-05-16 23:06:54.962345615 +0200
-@@ -93,7 +93,7 @@
- 
+@@ -100,7 +100,7 @@
  $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
  	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
-+	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(lib_LIBS) -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
+ 	$(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
+-		-shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
++		-shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
  
  $(libs_static): $(libbtrfs_objects)
  	@echo "    [AR]     $@"
diff -Naurp btrfs-tools-0.19+20130315/debian/patches/series btrfs-tools/debian/patches/series
--- btrfs-tools-0.19+20130315/debian/patches/series	2013-07-23 17:57:52.000000000 +0200
+++ btrfs-tools/debian/patches/series	2013-08-26 11:22:53.740877119 +0200
@@ -1,4 +1,3 @@
-02-ftbfs.patch
 03-manpage.patch
 04-linker.patch
 07-manpage2.patch
diff -Naurp btrfs-tools-0.19+20130315/debian/rules btrfs-tools/debian/rules
--- btrfs-tools-0.19+20130315/debian/rules	2013-07-29 16:09:35.000000000 +0200
+++ btrfs-tools/debian/rules	2013-08-26 11:46:01.542658461 +0200
@@ -16,12 +16,12 @@ CFLAGS := $(patsubst -O2,-Os,$(CFLAGS))
 	dh ${@}
 
 override_dh_auto_build:
-	dh_auto_build -- all btrfs-select-super calc-size CFLAGS="$(CFLAGS)" CC="$(CC)"
+	dh_auto_build -- all btrfs-select-super btrfs-calc-size CFLAGS="$(CFLAGS)" CC="$(CC)"
 
 override_dh_auto_clean:
 	dh_auto_clean
 
-	rm -f btrfs-select-super calc-size
+	rm -f btrfs-select-super btrfs-calc-size
 
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(CURDIR)/debian/btrfs-tools prefix=/usr bindir=/sbin mandir=/usr/share/man libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -44,8 +44,5 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install
 
-	# Avoid polluting namespace
-	mv debian/btrfs-tools/sbin/calc-size debian/btrfs-tools/sbin/btrfs-calc-size
-
 override_dh_strip:
 	dh_strip --dbg-package=btrfs-tools-dbg

Reply via email to