15 files changed, 58 insertions, 42 deletions
diff --git a/debian/patches/0001-fclose.3.patch b/debian/patches/0001-fclose.3.patch
index 111eaa1..5cbef5c 100644
--- a/debian/patches/0001-fclose.3.patch
+++ b/debian/patches/0001-fclose.3.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:19:16 +0100
 Subject: fclose.3
 
 ---
- man3/fclose.3 | 10 ++++++++++
+ man/man3/fclose.3 | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
---- a/man3/fclose.3
-+++ b/man3/fclose.3
+--- a/man/man3/fclose.3
++++ b/man/man3/fclose.3
 @@ -34,6 +34,16 @@
  (writing any buffered output data using
  .BR fflush (3))
diff --git a/debian/patches/0002-getpwent.3.patch b/debian/patches/0002-getpwent.3.patch
index 17c205c..0fe3db6 100644
--- a/debian/patches/0002-getpwent.3.patch
+++ b/debian/patches/0002-getpwent.3.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:20:19 +0100
 Subject: getpwent.3
 
 ---
- man3/getpwent.3 | 20 +++++++++++++++++++-
+ man/man3/getpwent.3 | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
---- a/man3/getpwent.3
-+++ b/man3/getpwent.3
+--- a/man/man3/getpwent.3
++++ b/man/man3/getpwent.3
 @@ -9,7 +9,8 @@
  .\"     386BSD man pages
  .\"
@@ -16,7 +16,7 @@ Subject: getpwent.3
 +.\" Modified Mon May 27 21:37:47 1996 by Martin Schulze <joey@linux.de>
 +.\" Modified Thu Dec 13 21:10:55 2001 by Martin Schulze <joey@infodrom.org>
  .\"
- .TH getpwent 3 2023-10-31 "Linux man-pages 6.7"
+ .TH getpwent 3 2024-05-02 "Linux man-pages (unreleased)"
  .SH NAME
 @@ -79,6 +80,21 @@
  };
diff --git a/debian/patches/0003-getpwnam.3.patch b/debian/patches/0003-getpwnam.3.patch
index 1cbe605..680ba72 100644
--- a/debian/patches/0003-getpwnam.3.patch
+++ b/debian/patches/0003-getpwnam.3.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:20:55 +0100
 Subject: getpwnam.3
 
 ---
- man3/getpwnam.3 | 9 +++++++++
+ man/man3/getpwnam.3 | 9 +++++++++
  1 file changed, 9 insertions(+)
 
---- a/man3/getpwnam.3
-+++ b/man3/getpwnam.3
+--- a/man/man3/getpwnam.3
++++ b/man/man3/getpwnam.3
 @@ -194,10 +194,18 @@
  .TP
  .B ERANGE
diff --git a/debian/patches/0004-nl_langinfo.3.patch b/debian/patches/0004-nl_langinfo.3.patch
index 716b320..9037c2b 100644
--- a/debian/patches/0004-nl_langinfo.3.patch
+++ b/debian/patches/0004-nl_langinfo.3.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:21:35 +0100
 Subject: nl_langinfo.3
 
 ---
- man3/nl_langinfo.3 | 2 ++
+ man/man3/nl_langinfo.3 | 2 ++
  1 file changed, 2 insertions(+)
 
---- a/man3/nl_langinfo.3
-+++ b/man3/nl_langinfo.3
+--- a/man/man3/nl_langinfo.3
++++ b/man/man3/nl_langinfo.3
 @@ -56,6 +56,8 @@
  .BR newlocale (3).
  Individual and additional elements of the locale categories can
diff --git a/debian/patches/0005-console_codes.4.patch b/debian/patches/0005-console_codes.4.patch
index 9f71c73..04e048e 100644
--- a/debian/patches/0005-console_codes.4.patch
+++ b/debian/patches/0005-console_codes.4.patch
@@ -3,18 +3,18 @@ Date: Sat, 6 Feb 2016 01:22:07 +0100
 Subject: console_codes.4
 
 ---
- man4/console_codes.4 | 3 +++
+ man/man4/console_codes.4 | 3 +++
  1 file changed, 3 insertions(+)
 
---- a/man4/console_codes.4
-+++ b/man4/console_codes.4
+--- a/man/man4/console_codes.4
++++ b/man/man4/console_codes.4
 @@ -14,6 +14,7 @@
  .\" Tiny correction, aeb, 961107.
  .\"
  .\" 2006-05-27, Several corrections - Thomas E. Dickey
 +.\" Modified Thu Dec 13 23:23:41 2001 by Martin Schulze <joey@infodrom.org>
  .\"
- .TH console_codes 4 2024-01-28 "Linux man-pages 6.7"
+ .TH console_codes 4 2024-05-02 "Linux man-pages (unreleased)"
  .SH NAME
 @@ -717,7 +718,9 @@
  ESC n	LS2	Invoke the G2 character set.
diff --git a/debian/patches/0006-dir_colors.5.patch b/debian/patches/0006-dir_colors.5.patch
index 1fb6b71..ff0a3e4 100644
--- a/debian/patches/0006-dir_colors.5.patch
+++ b/debian/patches/0006-dir_colors.5.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:22:32 +0100
 Subject: dir_colors.5
 
 ---
- man5/dir_colors.5 | 8 ++++++++
+ man/man5/dir_colors.5 | 8 ++++++++
  1 file changed, 8 insertions(+)
 
---- a/man5/dir_colors.5
-+++ b/man5/dir_colors.5
+--- a/man/man5/dir_colors.5
++++ b/man/man5/dir_colors.5
 @@ -374,8 +374,16 @@
  .TP
  .I /etc/DIR_COLORS
diff --git a/debian/patches/0007-motd.5.patch b/debian/patches/0007-motd.5.patch
index e1e7ee4..5d8f249 100644
--- a/debian/patches/0007-motd.5.patch
+++ b/debian/patches/0007-motd.5.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:22:57 +0100
 Subject: motd.5
 
 ---
- man5/motd.5 | 12 ++++++++++++
+ man/man5/motd.5 | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
---- a/man5/motd.5
-+++ b/man5/motd.5
+--- a/man/man5/motd.5
++++ b/man/man5/motd.5
 @@ -12,12 +12,20 @@
  The contents of
  .I /etc/motd
diff --git a/debian/patches/0008-nsswitch.conf.5.patch b/debian/patches/0008-nsswitch.conf.5.patch
index e0701af..217fc5c 100644
--- a/debian/patches/0008-nsswitch.conf.5.patch
+++ b/debian/patches/0008-nsswitch.conf.5.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:24:49 +0100
 Subject: nsswitch.conf.5
 
 ---
- man5/nsswitch.conf.5 | 5 +++++
+ man/man5/nsswitch.conf.5 | 5 +++++
  1 file changed, 5 insertions(+)
 
---- a/man5/nsswitch.conf.5
-+++ b/man5/nsswitch.conf.5
+--- a/man/man5/nsswitch.conf.5
++++ b/man/man5/nsswitch.conf.5
 @@ -274,6 +274,11 @@
  .I user
  from the NIS passwd/shadow map.
diff --git a/debian/patches/0009-resolv.conf.5.patch b/debian/patches/0009-resolv.conf.5.patch
index 8bf9d92..586e88d 100644
--- a/debian/patches/0009-resolv.conf.5.patch
+++ b/debian/patches/0009-resolv.conf.5.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:25:17 +0100
 Subject: resolv.conf.5
 
 ---
- man5/resolv.conf.5 | 2 ++
+ man/man5/resolv.conf.5 | 2 ++
  1 file changed, 2 insertions(+)
 
---- a/man5/resolv.conf.5
-+++ b/man5/resolv.conf.5
+--- a/man/man5/resolv.conf.5
++++ b/man/man5/resolv.conf.5
 @@ -249,6 +249,8 @@
  .BR getaddrinfo (3),
  rather than
diff --git a/debian/patches/0010-tzfile.5.patch b/debian/patches/0010-tzfile.5.patch
index 895df4c..2a6d5ea 100644
--- a/debian/patches/0010-tzfile.5.patch
+++ b/debian/patches/0010-tzfile.5.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:25:30 +0100
 Subject: tzfile.5
 
 ---
- man5/tzfile.5 | 16 ++++++++++++++++
+ man/man5/tzfile.5 | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
---- a/man5/tzfile.5
-+++ b/man5/tzfile.5
+--- a/man/man5/tzfile.5
++++ b/man/man5/tzfile.5
 @@ -210,6 +210,22 @@
  .B tzh_timecnt
  is zero or the time argument is less than the first transition time recorded
diff --git a/debian/patches/0013-rtnetlink.7.patch b/debian/patches/0013-rtnetlink.7.patch
index b9c5cd0..29032fb 100644
--- a/debian/patches/0013-rtnetlink.7.patch
+++ b/debian/patches/0013-rtnetlink.7.patch
@@ -3,11 +3,11 @@ Date: Sat, 6 Feb 2016 01:28:20 +0100
 Subject: rtnetlink.7
 
 ---
- man7/rtnetlink.7 | 1 +
+ man/man7/rtnetlink.7 | 1 +
  1 file changed, 1 insertion(+)
 
---- a/man7/rtnetlink.7
-+++ b/man7/rtnetlink.7
+--- a/man/man7/rtnetlink.7
++++ b/man/man7/rtnetlink.7
 @@ -13,6 +13,7 @@
  .SH SYNOPSIS
  .nf
diff --git a/debian/patches/0014-set-proper-installation-path.patch b/debian/patches/0014-set-proper-installation-path.patch
index bfd2eed..ca8b43d 100644
--- a/debian/patches/0014-set-proper-installation-path.patch
+++ b/debian/patches/0014-set-proper-installation-path.patch
@@ -7,14 +7,14 @@ Forwarded: not-needed
  share/mk/install/_.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/share/mk/configure/directory_variables.mk
-+++ b/share/mk/configure/directory_variables.mk
-@@ -13,7 +13,7 @@
+--- a/share/mk/configure/directory_variables/install.mk
++++ b/share/mk/configure/directory_variables/install.mk
+@@ -10,7 +10,7 @@
  
  
  DESTDIR     :=
 -prefix      := /usr/local
 +prefix      := /usr
  datarootdir := $(prefix)/share
+ mandir      := $(datarootdir)/man
  docdir      := $(datarootdir)/doc
- htmldir     := $(docdir)/html/man
diff --git a/debian/patches/0015-fix-groff-warning.patch b/debian/patches/0015-fix-groff-warning.patch
index c6f28ba..31bd626 100644
--- a/debian/patches/0015-fix-groff-warning.patch
+++ b/debian/patches/0015-fix-groff-warning.patch
@@ -5,11 +5,11 @@ Subject: Mark the glyphs as defined in groff.
 This prevents the man viewer from issuing
 warnings about missing characters.
 ---
- man7/glob.7 | 2 +-
+ man/man7/glob.7 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/man7/glob.7
-+++ b/man7/glob.7
+--- a/man/man7/glob.7
++++ b/man/man7/glob.7
 @@ -195,7 +195,7 @@
  element from its equivalence class, as defined for the
  current locale.
diff --git a/debian/patches/0016-set-fhs-mansections.patch b/debian/patches/0016-set-fhs-mansections.patch
new file mode 100644
index 0000000..48ef018
--- /dev/null
+++ b/debian/patches/0016-set-fhs-mansections.patch
@@ -0,0 +1,15 @@
+Description: use a more robust approach to limit manpages installation to FHS-compliant directories. Thanks to Alejandro Colomar (upstream author).
+Author: Marcos Fouces <marcos@debian.org>, Alejandro Colomar <alx@kernel.org>
+
+--- a/share/mk/configure/directory_variables/install.mk
++++ b/share/mk/configure/directory_variables/install.mk
+@@ -23,5 +23,9 @@
+ $(foreach s, $(MANSECTIONS),                                                  \
+ 	$(eval man$(s)ext := .$(s)))
+ 
++man2typedir  := $(man2dir)
++man3constdir := $(man3dir)
++man3headdir  := $(man3dir)
++man3typedir  := $(man3dir)
+ 
+ endif  # include guard
diff --git a/debian/patches/series b/debian/patches/series
index 6f58cf7..991df0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0013-rtnetlink.7.patch
 0014-set-proper-installation-path.patch
 0015-fix-groff-warning.patch
+0016-set-fhs-mansections.patch