Source: f2fs-tools
Followup-For: Bug #990533
The attached new versions improve some details and will hopefully
spare you some time.
>From 0b2b0708553fa335333c1811c7adccafddb6114e Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Thu, 1 Jul 2021 11:09:38 +0200
Subject: [PATCH 1/6] debian: remove get-orig-source target from debian/rules
Uscan is preferred when possible.
---
debian/rules | 7 -------
1 file changed, 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index 298b739..d494e69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,6 @@ override_dh_install:
override_dh_strip:
dh_strip --dbgsym-migration='f2fs-tools-dbg (<< 1.12.0-1~)'
-get-orig-source:
- wget http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$(DEB_VERSION_UPSTREAM).tar.gz
- gunzip < f2fs-tools-$(DEB_VERSION_UPSTREAM).tar.gz | \
- xz > f2fs-tools-$(DEB_VERSION_UPSTREAM).tar.xz
- rm f2fs-tools-$(DEB_VERSION_UPSTREAM).tar.gz
- mv f2fs-tools-$(DEB_VERSION_UPSTREAM).tar.xz f2fs-tools_$(DEB_VERSION_UPSTREAM).orig.tar.xz
-
# dh_dwz when run on f2fs-tools-udeb ends up installing the
# /usr/lib/debug/.dwz files into the udeb. I think that's a bug,
# but for now, override it by just saying... just don't.
--
2.30.2
>From 22c3cb1eae9e28a25c2eb0953096c0b94ba61244 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Thu, 1 Jul 2021 11:12:22 +0200
Subject: [PATCH 2/6] debian: remove redundant libdir option from
dh_auto_configure override
---
debian/rules | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index d494e69..9dd7659 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,6 @@ include /usr/share/dpkg/default.mk
override_dh_auto_configure:
dh_auto_configure -- --sbindir=/sbin --disable-shared \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--with-root-libdir=/lib/$(DEB_HOST_MULTIARCH)
override_dh_install:
--
2.30.2
>From 7d6744f42f02d6408cfc3cd8b4ec85c4a821e080 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Thu, 1 Jul 2021 11:14:00 +0200
Subject: [PATCH 3/6] debian: stop exporting build flags from debian/rules
Dh_auto_* tools already export the build flags, whether debian/rules
knowns about them or not.
In this case, debian/rules does not need to interfer.
The test_printenv target seems to have been introduced in order to
check the removed export.
---
debian/rules | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/debian/rules b/debian/rules
index 9dd7659..9bc4df8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,7 @@
export DEB_BUILD_MAINT_OPTIONS ?= hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/architecture.mk
%:
dh $@
@@ -28,6 +27,3 @@ override_dh_strip:
# but for now, override it by just saying... just don't.
override_dh_dwz:
dh_dwz -N f2fs-tools-udeb
-
-test_printenv:
- printenv | sort
--
2.30.2
>From 9ff31a9269d863cedd3b226b25542c1110197481 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Fri, 5 Nov 2021 14:19:03 +0100
Subject: [PATCH 4/6] debian: prevent installation of sg_write_buffer from
debian/not-installed
This declarative style is more readable than removal commands.
---
debian/f2fs-tools-udeb.install | 3 ++-
debian/f2fs-tools.install | 4 +++-
debian/not-installed | 5 +++++
debian/rules | 5 +----
4 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 debian/not-installed
diff --git a/debian/f2fs-tools-udeb.install b/debian/f2fs-tools-udeb.install
index d48cf30..5779210 100644
--- a/debian/f2fs-tools-udeb.install
+++ b/debian/f2fs-tools-udeb.install
@@ -1 +1,2 @@
-/sbin
+# All but sbin/sg_write_buffer
+sbin/*f2fs*
diff --git a/debian/f2fs-tools.install b/debian/f2fs-tools.install
index c5dbdb2..1b7999a 100644
--- a/debian/f2fs-tools.install
+++ b/debian/f2fs-tools.install
@@ -1,2 +1,4 @@
-sbin/*
+# All but sbin/sg_write_buffer
+sbin/*f2fs*
+
usr/share/man/man8/*.8
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..5cb77ca
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,5 @@
+# Policy recommends not to install libtool .la files
+usr/lib/*/libf2fs*.la
+
+# See f2fs-tools.install and f2fs-tools-udeb.install
+sbin/sg_write_buffer
diff --git a/debian/rules b/debian/rules
index 9bc4df8..792b787 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,7 @@ override_dh_auto_configure:
dh_auto_configure -- --sbindir=/sbin --disable-shared \
--with-root-libdir=/lib/$(DEB_HOST_MULTIARCH)
-override_dh_install:
- find $(CURDIR) -name "*.la" -delete
- rm $(CURDIR)/debian/tmp/sbin/sg_write_buffer
- dh_install
+override_dh_missing:
dh_missing --fail-missing
override_dh_strip:
--
2.30.2
>From c45e55569ef076240e5a3334d4b6a46c749663d3 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Fri, 5 Nov 2021 14:24:49 +0100
Subject: [PATCH 5/6] debian: update to debhelper 13
Dh_missing now enables --fail-missing by default.
Refine path patterns.
---
debian/control | 2 +-
debian/libf2fs-dev.install | 2 +-
debian/libf2fs-format-dev.install | 2 +-
debian/not-installed | 2 +-
debian/rules | 3 ---
5 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index 994b60d..a177742 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Filesystems Group <filesystems-de...@lists.alioth.debian.org>
Uploaders: Vincent Cheng <vch...@debian.org>, Theodore Y. Ts'o <ty...@mit.edu>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
libblkid-dev,
libselinux1-dev,
pkg-config,
diff --git a/debian/libf2fs-dev.install b/debian/libf2fs-dev.install
index 5a98ca9..71058f1 100644
--- a/debian/libf2fs-dev.install
+++ b/debian/libf2fs-dev.install
@@ -1,3 +1,3 @@
usr/include/* usr/include/f2fs-tools
include/android_config.h usr/include/f2fs-tools
-usr/lib/*/libf2fs.a
+usr/lib/${DEB_HOST_MULTIARCH}/libf2fs.a
diff --git a/debian/libf2fs-format-dev.install b/debian/libf2fs-format-dev.install
index 7481102..e42c2ab 100644
--- a/debian/libf2fs-format-dev.install
+++ b/debian/libf2fs-format-dev.install
@@ -1,2 +1,2 @@
-usr/lib/*/libf2fs_format.a
+usr/lib/${DEB_HOST_MULTIARCH}/libf2fs_format.a
mkfs/*.h usr/include/f2fs-tools
diff --git a/debian/not-installed b/debian/not-installed
index 5cb77ca..a5a111a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,5 @@
# Policy recommends not to install libtool .la files
-usr/lib/*/libf2fs*.la
+usr/lib/${DEB_HOST_MULTIARCH}/libf2fs*.la
# See f2fs-tools.install and f2fs-tools-udeb.install
sbin/sg_write_buffer
diff --git a/debian/rules b/debian/rules
index 792b787..67c1e09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,6 @@ override_dh_auto_configure:
dh_auto_configure -- --sbindir=/sbin --disable-shared \
--with-root-libdir=/lib/$(DEB_HOST_MULTIARCH)
-override_dh_missing:
- dh_missing --fail-missing
-
override_dh_strip:
dh_strip --dbgsym-migration='f2fs-tools-dbg (<< 1.12.0-1~)'
--
2.30.2
>From d52653d8af4e4c027f7e545c920ecfc6785fb46d Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Fri, 5 Nov 2021 14:01:39 +0100
Subject: [PATCH 6/6] debian: rename debian/docs with an explicit package
prefix
---
debian/{docs => f2fs-tools.docs} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename debian/{docs => f2fs-tools.docs} (100%)
diff --git a/debian/docs b/debian/f2fs-tools.docs
similarity index 100%
rename from debian/docs
rename to debian/f2fs-tools.docs
--
2.30.2
