Control: tags -1 + patch pending
Dear maintainer,
I've prepared an NMU for btrfs-progs (versioned as 6.6.3-1.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru btrfs-progs-6.6.3/debian/btrfs-progs.install btrfs-progs-6.6.3/debian/btrfs-progs.install
--- btrfs-progs-6.6.3/debian/btrfs-progs.install 2023-12-29 17:48:37.000000000 +0100
+++ btrfs-progs-6.6.3/debian/btrfs-progs.install 2024-06-12 21:22:17.000000000 +0200
@@ -1,3 +1,3 @@
-bin/
-sbin/
+usr/bin/
+usr/sbin/
usr/share/
diff -Nru btrfs-progs-6.6.3/debian/changelog btrfs-progs-6.6.3/debian/changelog
--- btrfs-progs-6.6.3/debian/changelog 2024-02-28 06:21:59.000000000 +0100
+++ btrfs-progs-6.6.3/debian/changelog 2024-06-12 21:22:17.000000000 +0200
@@ -1,3 +1,15 @@
+btrfs-progs (6.6.3-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch Build-Depends from udev to systemd-dev (Closes: #1065385)
+ * Install files into UsrMerged layout (DEP17 M2) (Closes: #1073073)
+
+ [ Peter Michael Green ]
+ * Change inode_includes to ext2fs_inode_includes (Closes: #1071297)
+ * Bump dependency on libext2fs-dev.
+
+ -- Chris Hofstaedtler <z...@debian.org> Wed, 12 Jun 2024 21:22:17 +0200
+
btrfs-progs (6.6.3-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru btrfs-progs-6.6.3/debian/control btrfs-progs-6.6.3/debian/control
--- btrfs-progs-6.6.3/debian/control 2024-02-28 06:21:59.000000000 +0100
+++ btrfs-progs-6.6.3/debian/control 2024-06-12 21:22:17.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adam Borowski <kilob...@angband.pl>
Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
- libext2fs-dev,
+ libext2fs-dev (>= 1.47.1),
pkg-config,
libacl1-dev,
libblkid-dev,
@@ -12,7 +12,7 @@
libudev-dev,
libzstd-dev,
uuid-dev,
- udev,
+ systemd-dev,
zlib1g-dev,
sphinx,
python3-sphinx-rtd-theme,
diff -Nru btrfs-progs-6.6.3/debian/patches/debian-changes btrfs-progs-6.6.3/debian/patches/debian-changes
--- btrfs-progs-6.6.3/debian/patches/debian-changes 1970-01-01 01:00:00.000000000 +0100
+++ btrfs-progs-6.6.3/debian/patches/debian-changes 2024-06-12 21:22:17.000000000 +0200
@@ -0,0 +1,27 @@
+Description: Autogenerated patch header for a single-debian-patch file.
+ The delta against upstream is either kept as a single patch, or maintained
+ in some VCS, and exported as a single patch instead of more manageable
+ atomic patches.
+Forwarded: not-needed
+
+---
+--- btrfs-progs-6.6.3.orig/convert/source-ext2.c
++++ btrfs-progs-6.6.3/convert/source-ext2.c
+@@ -730,7 +730,7 @@ static inline void ext4_decode_extra_tim
+ #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec) \
+ do { \
+ tv_sec = src->i_ ## xtime ; \
+- if (inode_includes(inode_size, i_ ## xtime ## _extra)) { \
++ if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) { \
+ tv_sec = src->i_ ## xtime ; \
+ ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ## _extra); \
+ btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec); \
+@@ -771,7 +771,7 @@ static int ext4_copy_inode_timespec_extr
+ EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec);
+
+ tv_sec = src->i_crtime;
+- if (inode_includes(inode_size, i_crtime_extra)) {
++ if (ext2fs_inode_includes(inode_size, i_crtime_extra)) {
+ tv_sec = src->i_crtime;
+ ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra);
+ btrfs_set_stack_timespec_sec(&dst->otime, tv_sec);
diff -Nru btrfs-progs-6.6.3/debian/patches/series btrfs-progs-6.6.3/debian/patches/series
--- btrfs-progs-6.6.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ btrfs-progs-6.6.3/debian/patches/series 2024-06-12 21:22:16.000000000 +0200
@@ -0,0 +1 @@
+debian-changes
diff -Nru btrfs-progs-6.6.3/debian/rules btrfs-progs-6.6.3/debian/rules
--- btrfs-progs-6.6.3/debian/rules 2023-12-29 18:00:59.000000000 +0100
+++ btrfs-progs-6.6.3/debian/rules 2024-06-12 21:22:17.000000000 +0200
@@ -14,7 +14,7 @@
dh_autoreconf ./autogen.sh
override_dh_auto_configure:
- dh_auto_configure -- --bindir=/bin
+ dh_auto_configure
override_dh_auto_build:
dh_auto_build -- V=1
@@ -23,9 +23,9 @@
dh_auto_install -- install
cd libbtrfsutil/python; \
python3 setup.py install --install-layout=deb --skip-build --root ../../debian/tmp --prefix /usr
- mkdir -p debian/tmp/sbin
- mv debian/tmp/bin/fsck.btrfs debian/tmp/sbin/fsck.btrfs
- mv debian/tmp/bin/mkfs.btrfs debian/tmp/sbin/mkfs.btrfs
+ mkdir -p debian/tmp/usr/sbin
+ mv debian/tmp/usr/bin/fsck.btrfs debian/tmp/usr/sbin/fsck.btrfs
+ mv debian/tmp/usr/bin/mkfs.btrfs debian/tmp/usr/sbin/mkfs.btrfs
# Adding initramfs-tools integration
install -D -m 0755 debian/local/btrfs.hook debian/btrfs-progs/usr/share/initramfs-tools/hooks/btrfs
