Package: src:btrfs-progs Version: 4.9.1-1 Control: tags -1 patch Hi Dmitri,
Attached are a number of patches against 4.9.1-1. If you prefer to pull or cherry pick, please use the 'proposed' branch of this repo: g...@github.com:sten0/btrfs-progs.git The non-dfsg-free bits appeared around either in 4.10 or 4.10.1 IIRC. git log --pretty=oneline --abbrev-commit --cherry debian/4.9.1-1..HEAD: + c6d0b50e Update changelog + b40bb2e5 Switch to automatically generated -dbgsym package + 522ff303 Drop btrfs-tools transitional dummy package + 44b1d91c debian/watch: Switch to version 4 and add repacksuffix=+dfsg + ac469a6b d/control: add whitespace (cosmetic fix) + e0ea798b Update copyright for new locations of: radix-tree.c and radix-tree.h + 4f8bd0f4 Add dversionmangle to handle dfsg version suffix + 655e1158 4.6.1-1 did not fix package license Btrfs-progs is explicitly GPL2 and not GPL2+. + 9e41daf5 Exclude non-free-RFC-BCP78 files (affects test suite) + e87b785f Update Source, because Chris Mason's branch hasn't been updated since v4.4 + 568af50a Move all binaries back to /sbin (Closes: #786893) + f714d292 Drop btrfs-convert (Closes: #824895, #854489) + dbf42a86 Ignore .pc, the quilt state tracking dir + a2f18508 Override dh_auto_clean to work around upstream bug where make clean cannot be run before ./configure Of these I believe the following are essential or important: a2f18508 0001-Override-dh_auto_clean-to-work-around-upstream-bug-w.patch e87b785f 0005-Update-Source-because-Chris-Mason-s-branch-hasn-t-be.patch 9e41daf5 0006-Exclude-non-free-RFC-BCP78-files-affects-test-suite.patch 655e1158 0007-4.6.1-1-did-not-fix-package-license.patch 4f8bd0f4 0008-Add-dversionmangle-to-handle-dfsg-version-suffix.patch e0ea798b 0009-Update-copyright-for-new-locations-of.patch 44b1d91c 0011-debian-watch-Switch-to-version-4-and-add-repacksuffi.patch c6d0b50e 0014-Update-changelog.patch * and remove lines for any patches you reject :-) 'Nice to have' ones, but I read that the Ignore-.pc one can be important for dgit hosted packages: dbf42a86 0002-Ignore-.pc-the-quilt-state-tracking-dir.patch ac469a6b 0010-d-control-add-whitespace-cosmetic-fix.patch With respect to this next patch, shouldn't mkfs.btrfs be installed alongside all the other /sbin/mkfs.filesystem binaries? This is the fastest way to accomplish it, and it also closes a bug: 568af50a 0004-Move-all-binaries-back-to-sbin-Closes-786893.patch I support your suggestion in #824895 to drop btrfs-convert, and additionally I wonder if it should be dropped for stretch, because in 4.10.1 it was rewritten, again, "to address previous design issues". Now that btrfs-progs has shipped in a stable release btrfs-tools can be dropped. Finally I've read that -dbgsym is standard in Ubuntu and at some point it will become a requirement in Debian...no better time then the present, right? :-) 0003-Drop-btrfs-convert-Closes-824895-854489.patch 0012-Drop-btrfs-tools-transitional-dummy-package.patch 0013-Switch-to-automatically-generated-dbgsym-package.patch 'hope you find some of these helpful! Nicholas
From a2f1850869b63e1244778718f620accdf81c9c79 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sat, 11 Mar 2017 20:04:35 -0500 Subject: [PATCH 01/14] Override dh_auto_clean to work around upstream bug where make clean cannot be run before ./configure --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index 265ef280..6be097c8 100755 --- a/debian/rules +++ b/debian/rules @@ -36,3 +36,8 @@ override_dh_auto_test: override_dh_strip: dh_strip --dbg-package=btrfs-progs-dbg + +override_dh_auto_clean: + if test -f Makefile.inc; then \ + dh_auto_clean; \ + fi -- 2.11.0
From dbf42a8606559212902f628cd71b69aba0cd4376 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sat, 11 Mar 2017 20:27:13 -0500 Subject: [PATCH 02/14] Ignore .pc, the quilt state tracking dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 98b3657b..ba8c8590 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ stamp-h.in stamp-h1 config/* +.pc -- 2.11.0
From f714d2925caed58936d6e068ca206cf40499af37 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Sat, 11 Mar 2017 20:34:22 -0500
Subject: [PATCH 03/14] Drop btrfs-convert (Closes: #824895, #854489)
Rationale: the test failed
...
[TEST] convert-tests.sh
[TEST/conv] 001-ext2-basic
[TEST/conv] ext2 4k nodesize, btrfs defaults
failed: /scratch/btrfs-progs-v4.10/btrfs-convert --rollback /scratch/btrfs-progs-v4.10/tests/test.img
test failed for case 001-ext2-basic
Makefile:271: recipe for target 'test-convert' failed
make: *** [test-convert] Error 1
---
debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 6be097c8..f6181164 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_autoreconf:
dh_autoreconf ./autogen.sh
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/bin
+ dh_auto_configure -- --bindir=/bin --disable-convert
override_dh_auto_build:
dh_auto_build -- V=1
--
2.11.0
From 568af50aee8a58dbfc5ac21f3a6a623cc0c54e29 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sat, 11 Mar 2017 21:14:15 -0500 Subject: [PATCH 04/14] Move all binaries back to /sbin (Closes: #786893) --- debian/btrfs-progs-udeb.install | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/btrfs-progs-udeb.install b/debian/btrfs-progs-udeb.install index 3effab9e..f06a6498 100644 --- a/debian/btrfs-progs-udeb.install +++ b/debian/btrfs-progs-udeb.install @@ -1,2 +1,2 @@ -btrfs /bin -mkfs.btrfs /bin +btrfs /sbin +mkfs.btrfs /sbin diff --git a/debian/rules b/debian/rules index f6181164..0ac43c76 100755 --- a/debian/rules +++ b/debian/rules @@ -19,7 +19,7 @@ override_dh_autoreconf: dh_autoreconf ./autogen.sh override_dh_auto_configure: - dh_auto_configure -- --bindir=/bin --disable-convert + dh_auto_configure -- --bindir=/sbin --disable-convert override_dh_auto_build: dh_auto_build -- V=1 -- 2.11.0
From e87b785f7b137221212148f2083a0755803f6cb7 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sun, 19 Mar 2017 15:03:32 -0400 Subject: [PATCH 05/14] Update Source, because Chris Mason's branch hasn't been updated since v4.4 --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 3412f64b..021c89ab 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: linux-bt...@vger.kernel.org -Source: http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git +Source: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git Files: * Copyright: 2007-2012 Oracle <http://www.oracle.com/> -- 2.11.0
From 9e41daf5e64728c48c33a1836f140f5af991ab1e Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sun, 19 Mar 2017 15:05:56 -0400 Subject: [PATCH 06/14] Exclude non-free-RFC-BCP78 files (affects test suite) --- debian/copyright | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/copyright b/debian/copyright index 021c89ab..914dd2e6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: linux-bt...@vger.kernel.org Source: https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git +Files-Excluded: tests/sha224-256.c tests/sha.h tests/sha-private.h Files: * Copyright: 2007-2012 Oracle <http://www.oracle.com/> -- 2.11.0
From 655e1158d412058ac68618c1e9e2a1e07f2599a5 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sun, 19 Mar 2017 15:18:31 -0400 Subject: [PATCH 07/14] 4.6.1-1 did not fix package license Btrfs-progs is explicitly GPL2 and not GPL2+. eg: SUSE and RedHat examples: GPL2: https://build.opensuse.org/package/view_file/openSUSE:Factory/btrfsprogs/btrfsprogs.spec http://pkgs.fedoraproject.org/cgit/rpms/btrfs-progs.git/tree/btrfs-progs.spec vs GPL2+: https://build.opensuse.org/package/view_file/network:utilities/iptraf/iptraf.spec http://pkgs.fedoraproject.org/cgit/rpms/iptraf-ng.git/tree/iptraf-ng.spec --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 914dd2e6..3ae2af71 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Files-Excluded: tests/sha224-256.c tests/sha.h tests/sha-private.h Files: * Copyright: 2007-2012 Oracle <http://www.oracle.com/> -License: GPL-2+ +License: GPL-2 Files: radix-tree.c Copyright: 2007-2009 Oracle <http://www.oracle.com/> -- 2.11.0
From 4f8bd0f44e6a85ca59928bb95c702abbc08d382c Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Sun, 19 Mar 2017 16:02:53 -0400 Subject: [PATCH 08/14] Add dversionmangle to handle dfsg version suffix --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index ab6a7caa..6126779d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/(\d)[_\.\-\+]?(rc\d*)$/$1~$2/,pgpsigurlmangle=s/\.tar.*$/\.tar.sign/,decompress" \ +opts="dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//,uversionmangle=s/(\d)[_\.\-\+]?(rc\d*)$/$1~$2/,pgpsigurlmangle=s/\.tar.*$/\.tar.sign/,decompress" \ https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v(.+)\.tar\.xz -- 2.11.0
From e0ea798b52c3595d097f26a6af55b67b0a2dd958 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Thu, 2 Feb 2017 16:01:49 -0500 Subject: [PATCH 09/14] Update copyright for new locations of: radix-tree.c and radix-tree.h --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 3ae2af71..91b88570 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,14 +7,14 @@ Files: * Copyright: 2007-2012 Oracle <http://www.oracle.com/> License: GPL-2 -Files: radix-tree.c +Files: kernel-lib/radix-tree.c Copyright: 2007-2009 Oracle <http://www.oracle.com/> 2001 Momchil Velikov 2001 Christoph Hellwig 2005 SGI, Christoph Lameter <clame...@sgi.com> License: GPL-2 -Files: radix-tree.h +Files: kernel-lib/radix-tree.h Copyright: 2007-2009 Oracle <http://www.oracle.com/> 2001 Momchil Velikov 2001 Christoph Hellwig -- 2.11.0
From ac469a6b75d559a38fd4052fdc5c7f42e7559c25 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Thu, 2 Feb 2017 15:08:13 -0500
Subject: [PATCH 10/14] d/control: add whitespace (cosmetic fix)
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 21979a50..ca0b1a47 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
libblkid-dev,
liblzo2-dev,
uuid-dev,
- udev,
+ udev,
zlib1g-dev,
asciidoc,
xmlto,
--
2.11.0
From 44b1d91cd6c892b8161377c96e31f4549e68a347 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Thu, 6 Apr 2017 19:16:10 -0400 Subject: [PATCH 11/14] debian/watch: Switch to version 4 and add repacksuffix=+dfsg --- debian/watch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/watch b/debian/watch index 6126779d..d11a06a3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 -opts="dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//,uversionmangle=s/(\d)[_\.\-\+]?(rc\d*)$/$1~$2/,pgpsigurlmangle=s/\.tar.*$/\.tar.sign/,decompress" \ +version=4 +opts="dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//,uversionmangle=s/(\d)[_\.\-\+]?(rc\d*)$/$1~$2/,pgpsigurlmangle=s/\.tar.*$/\.tar.sign/,decompress,repacksuffix=+dfsg" \ https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v(.+)\.tar\.xz -- 2.11.0
From 522ff303e900bc90207f11597d4c4da965814d09 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Fri, 30 Jun 2017 15:33:32 -0400
Subject: [PATCH 12/14] Drop btrfs-tools transitional dummy package
---
debian/control | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/debian/control b/debian/control
index ca0b1a47..951d1475 100644
--- a/debian/control
+++ b/debian/control
@@ -34,13 +34,6 @@ Description: Checksumming Copy on Write Filesystem utilities
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
-Section: oldlibs
-Architecture: linux-any
-Depends: btrfs-progs, ${misc:Depends}, ${shlibs:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
Package: btrfs-progs-udeb
Package-Type: udeb
Section: debian-installer
@@ -62,11 +55,3 @@ Description: Checksumming Copy on Write Filesystem utilities (debug)
administration.
.
This package contains the debugging symbols.
-
-Package: btrfs-tools-dbg
-Section: oldlibs
-Priority: extra
-Architecture: linux-any
-Depends: btrfs-progs-dbg, ${misc:Depends}
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
--
2.11.0
From b40bb2e59bc7e3b84f52c530db14beddbcdbc292 Mon Sep 17 00:00:00 2001
From: Nicholas D Steeves <nstee...@gmail.com>
Date: Fri, 30 Jun 2017 16:18:36 -0400
Subject: [PATCH 13/14] Switch to automatically generated -dbgsym package
---
debian/control | 16 +---------------
debian/rules | 2 +-
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/debian/control b/debian/control
index 951d1475..eb95073f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: btrfs-progs
Section: admin
Priority: optional
Maintainer: Dimitri John Ledkov <x...@debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
dh-autoreconf,
e2fslibs-dev,
pkg-config,
@@ -41,17 +41,3 @@ Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: btrfs-tools-udeb
Description: Checksumming Copy on Write Filesystem utilities (udeb)
-
-Package: btrfs-progs-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: btrfs-progs (= ${binary:Version}), ${misc:Depends}
-Replaces: btrfs-tools-dbg (<< 4.4.1-1)
-Breaks: btrfs-tools-dbg (<< 4.4.1-1)
-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.
diff --git a/debian/rules b/debian/rules
index 0ac43c76..e72cd4f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ override_dh_auto_install:
override_dh_auto_test:
override_dh_strip:
- dh_strip --dbg-package=btrfs-progs-dbg
+ dh_strip --dbgsym-migration='btrfs-progs (<< 4.11.1+dfsg-1~)'
override_dh_auto_clean:
if test -f Makefile.inc; then \
--
2.11.0
From c6d0b50e372dcb20f1471946b9e7c84c0ff5a098 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves <nstee...@gmail.com> Date: Fri, 30 Jun 2017 16:25:51 -0400 Subject: [PATCH 14/14] Update changelog --- debian/changelog | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb0b3db1..7f358848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +btrfs-progs (4.11.1+dfsg-1) unstable; urgency=medium + + [ Nicholas D Steeves ] + * Drop btrfs-convert. (Closes: #824895, #854489) + * Move all binaries back to /sbin. (Closes: #786893) + * debian/copyright: + - Update Source, because Chris Mason's branch hasn't been updated + since v4.4. + - Exclude non-free-RFC-BCP78 files (affects test suite). + - Fix license, because Btrfs-progs is explicitly GPL2 and not GPL2+ + and 4.6.1-1 did not fix this. + - Update copyright for new locations of: radix-tree.c and radix-tree.h + * debian/watch: + - Add dversionmangle to handle dfsg version suffix. + - Switch to version 4 and add repacksuffix=+dfsg. + * d/control: + - Override dh_auto_clean to work around upstream bug where make clean + cannot be run before ./configure. + - Add whitespace (cosmetic fix). + - Drop btrfs-tools transitional dummy packages. + * Switch to automatically generated -dbgsym package. + - debian/rules: Switch to dh_strip --dbgsym-migration. + - debian/control: Drop btrfs-progs-dbg. + - debian/control: Bump Build-Depends to debhelper >= 10. + + -- Nicholas D Steeves <nstee...@gmail.com> Fri, 30 Jun 2017 16:25:40 -0400 + btrfs-progs (4.9.1-1) unstable; urgency=medium [ Dimitri John Ledkov ] -- 2.11.0
signature.asc
Description: Digital signature
