control: tag -1 - moreinfo Am 03.05.19 um 20:59 schrieb Paul Gevers: > Could you please provide a debdiff of the intended change? I have the > feeling this may be OK, so if you feel confident as well, you could > upload to unstable. We are talking here about *only* adding the missing > manpage(s), right? No other packaging changes. Please remove the > moreinfo tag after you did one or both of these actions.
Hi Paul, thanks a lot for your quick answer. Upon further investigation, I noticed that the package keyutils also removed some manpages which have been shifted into the kernel man-pages project. I've included those manpages as well, but because this is a bigger change than previously discussed with you, I did not upload yet. I've attached the .dsc debdiff. I can confirm that the debdiff of the binary packages shows the newly included manpages. Regards, Tobias
diff -Nru manpages-4.16/debian/changelog manpages-4.16/debian/changelog
--- manpages-4.16/debian/changelog 2018-05-05 14:59:16.000000000 +0200
+++ manpages-4.16/debian/changelog 2019-05-03 22:44:52.000000000 +0200
@@ -1,3 +1,17 @@
+manpages (4.16-2) unstable; urgency=medium
+
+ * Include removed manpages from attr and keyutils.
+ Both projects have moved some of their manpages to the
+ Linux man-pages project.
+ - attr: getxattr.2, listxattr.2, removexattr.2, setxattr.2,
+ and their f*xattr.2 and l*xattr.2 links. Also attr.5.
+ - keyutils: keyrings.7, persistent-keyring.7, process-keyring.7,
+ session-keyring.7, thread-keyring.7, user-keyring.7,
+ user-session-keyring.7.
+ (Closes: #825022)
+
+ -- Dr. Tobias Quathamer <to...@debian.org> Fri, 03 May 2019 22:44:52 +0200
+
manpages (4.16-1) unstable; urgency=medium
* New upstream version 4.16
diff -Nru manpages-4.16/debian/control manpages-4.16/debian/control
--- manpages-4.16/debian/control 2018-05-05 14:57:16.000000000 +0200
+++ manpages-4.16/debian/control 2019-05-03 22:20:02.000000000 +0200
@@ -33,8 +33,12 @@
Multi-Arch: foreign
Depends: manpages, ${misc:Depends}
Suggests: man-browser
-Replaces: manpages (<< 4.13-3), libbsd-dev (<< 0.8.4-1)
-Breaks: manpages (<< 4.13-3), libbsd-dev (<< 0.8.4-1)
+Replaces: manpages (<< 4.13-3), libbsd-dev (<< 0.8.4-1),
+ attr (<< 1:2.4.47-3), libattr1-dev (<< 1:2.4.47-3),
+ keyutils (<< 1.6-1)
+Breaks: manpages (<< 4.13-3), libbsd-dev (<< 0.8.4-1),
+ attr (<< 1:2.4.47-3), libattr1-dev (<< 1:2.4.47-3),
+ keyutils (<< 1.6-1)
Priority: optional
Description: Manual pages about using GNU/Linux for development
These man pages describe the Linux programming interface, including
diff -Nru manpages-4.16/debian/rules manpages-4.16/debian/rules
--- manpages-4.16/debian/rules 2018-05-05 14:33:16.000000000 +0200
+++ manpages-4.16/debian/rules 2019-05-03 22:20:41.000000000 +0200
@@ -22,34 +22,14 @@
rm -f debian/manpages/usr/share/man/man4/sk98lin.4
# Start of automatically added files by debian/check-conflicts
rm -f debian/manpages/usr/share/man/man1/time.1
- rm -f debian/manpages-dev/usr/share/man/man2/fgetxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/flistxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/fremovexattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/fsetxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/getxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/lgetxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/listxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/llistxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/lremovexattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/lsetxattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/removexattr.2
- rm -f debian/manpages-dev/usr/share/man/man2/setxattr.2
rm -f debian/manpages-dev/usr/share/man/man3/pthread_atfork.3
rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutexattr_destroy.3
rm -f debian/manpages-dev/usr/share/man/man3/pthread_mutexattr_init.3
rm -f debian/manpages/usr/share/man/man4/fd.4
- rm -f debian/manpages/usr/share/man/man5/attr.5
rm -f debian/manpages/usr/share/man/man5/ftpusers.5
rm -f debian/manpages/usr/share/man/man5/nscd.conf.5
rm -f debian/manpages/usr/share/man/man5/passwd.5
rm -f debian/manpages/usr/share/man/man5/tmpfs.5
- rm -f debian/manpages/usr/share/man/man7/keyrings.7
- rm -f debian/manpages/usr/share/man/man7/persistent-keyring.7
- rm -f debian/manpages/usr/share/man/man7/process-keyring.7
- rm -f debian/manpages/usr/share/man/man7/session-keyring.7
- rm -f debian/manpages/usr/share/man/man7/thread-keyring.7
- rm -f debian/manpages/usr/share/man/man7/user-keyring.7
- rm -f debian/manpages/usr/share/man/man7/user-session-keyring.7
rm -f debian/manpages/usr/share/man/man8/nscd.8
# End of automatically added files by debian/check-conflicts
signature.asc
Description: OpenPGP digital signature
