Hi, Le 01/12/2012 19:07, David Prévot a écrit : > Please unblock package manpages, it fixes an important issue in the > Debian-specific part of the package (#691414, see motd.5.diff attached). > > Since it's a documentation only package, it has also been updated, the > attached diff spares you most of these documentation changes. Sorry, I meant to send an even more filtered one, please consider the two diff attached to this message. > unblock manpages/3.44-1 > > Thanks (a lot) in advance for considering it, and please note that the > French translation is ready too (fixing the important Debian-specific > issue), so I may bug you again if you agree with this unblock: > > unblock manpages-fr/3.44d1p1-1 Cheers David
--- manpages-3.44.orig/man5/motd.5 +++ manpages-3.44/man5/motd.5 @@ -28,17 +28,29 @@ motd \- message of the day .SH DESCRIPTION The contents of \fI/etc/motd\fP are displayed by -.BR login (1) +.BR pam_motd (8) after a successful login but just before it executes the login shell. The abbreviation "motd" stands for "message of the day", and this file has been traditionally used for exactly that (it requires much less disk space than mail to all users). + +On Debian GNU/Linux, the content of +.I /run/motd.dynamic +is also displayed. +This file is generated by +.I /etc/init.d/motd +at boot. .SH FILES -/etc/motd +.I /etc/motd +.br +.I /run/motd.dynamic +.br +.I /etc/init.d/motd .SH "SEE ALSO" .BR login (1), .BR issue (5) +.BR pam_motd(8) .SH COLOPHON This page is part of release 3.44 of the Linux .I man-pages
diff -Nru --exclude 'man?' --exclude 'Changes*' --exclude 'man-pages-*' manpages-3.42/debian/changelog manpages-3.44/debian/changelog
--- manpages-3.42/debian/changelog 2012-12-01 18:36:00.000000000 -0400
+++ manpages-3.44/debian/changelog 2012-12-01 18:36:00.000000000 -0400
@@ -1,3 +1,23 @@
+manpages (3.44-1) unstable; urgency=low
+
+ * Imported Upstream version 3.44: (Closes: #692595)
+ . new manpages: getauxval.3 secure_getenv.3
+ . major update to delete_module.2 init_module.2 prctl.2 getauxval.3 proc.5
+ . fts.3: Improve description of physical vs. logical (Closes: #633505)
+ . getdomainname.2: these calls relate to NIS, not DNS (Closes: #295635)
+ . proc.5: fix 'starttime' description of /proc/PID/stat (Closes: #675891)
+ . ptrace.2: Clarify some operations are not present on all
+ architectures (Closes: #122383)
+ * motd.5 updated and motd.tail removed: due to new behaviour of sysvinit
+ 2.88dsf-24 (Closes: #691414)
+ * Add glibc-doc-reference to package description (Closes: #640764)
+ * fputs.3: missing space in putc(c,stdout) (Closes: #693255)
+ * resolv.conf.5: Document IPv6 format for nameserver (Closes: #610036)
+ * stat.2: Clarify description of EOVERFLOW error (Closes: #604928)
+ * Ack my NMUs (Closes: #651476, #670874)
+
+ -- Simon Paillard <spaillard@debian.org> Fri, 16 Nov 2012 19:56:48 +0100
+
manpages (3.42-1) unstable; urgency=low
[ Simon Paillard ]
diff -Nru --exclude 'man?' --exclude 'Changes*' --exclude 'man-pages-*' manpages-3.42/debian/check-conflicts manpages-3.44/debian/check-conflicts
--- manpages-3.42/debian/check-conflicts 1969-12-31 20:00:00.000000000 -0400
+++ manpages-3.44/debian/check-conflicts 2012-12-01 18:36:00.000000000 -0400
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+BASEMAN="/usr/share/man"
+
+which apt-file >/dev/null 2>&1
+if [ $? -ne 0 ] ; then
+ echo "apt-file is required" 1>&2 ;
+ exit 1
+fi
+
+echo -e "WARNING: This tool assumes apt-file has been updated based on sid\n" 1>&2 ;
+
+
+for j in man*/*.* ;
+ do (dpkg -S "$BASEMAN/$j.gz" 2>/dev/null || apt-file search "$BASEMAN/$j.gz") \
+ | grep -v '^manpages:' \
+ | grep -v '^manpages-dev:' ;
+done
diff -Nru --exclude 'man?' --exclude 'Changes*' --exclude 'man-pages-*' manpages-3.42/debian/control manpages-3.44/debian/control
--- manpages-3.42/debian/control 2012-12-01 18:36:00.000000000 -0400
+++ manpages-3.44/debian/control 2012-12-01 18:36:00.000000000 -0400
@@ -5,8 +5,8 @@
Priority: important
Build-Depends: debhelper (>= 7)
Standards-Version: 3.9.3
-Vcs-Browser: http://cvs.infodrom.org/manpages/?cvsroot=debian
-Vcs-CVS: :pserver:anonymous@cvs.infofrom.org:/var/cvs/debian manpages
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/manpages.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/manpages.git
Homepage: http://www.kernel.org/doc/man-pages/
Package: manpages
@@ -39,4 +39,4 @@
these two sections:
2 = Linux system calls.
3 = Library calls (note that a more comprehensive source of information
- may be found in the glibc-doc package).
+ may be found in the glibc-doc and glibc-doc-reference packages).
diff -Nru --exclude 'man?' --exclude 'Changes*' --exclude 'man-pages-*' manpages-3.42/debian/inst manpages-3.44/debian/inst
--- manpages-3.42/debian/inst 2012-12-01 18:36:00.000000000 -0400
+++ manpages-3.44/debian/inst 2012-12-01 18:36:00.000000000 -0400
@@ -15,13 +15,15 @@
for j in $i/*.*; do
echo -n ${j#*/}
case ${j#*/} in
- time.1|ldd.1|\
+ time.1|\
console.4|fd.4|fstab.5|ftpusers.5|lilo.conf.5|nfs.5|exports.5|ttytype.5|\
- passwd.5|lilo.8|zic.8|zdump.8|ldconfig.8|nscd.conf.5|nscd.8|\
- mdoc.samples.7|environ.5|\
- ld.so.8)
+ passwd.5|lilo.8|zic.8|zdump.8|\
+ mdoc.samples.7|environ.5)
echo -n "(skipped)"
;;
+ ldd.1|ldconfig.8|ld.so.8|nscd.conf.5|nscd.8)
+ echo -n "(skipped, provided by eglibc)"
+ ;;
*)
read Y < $j
case "$Y" in
@@ -63,11 +65,13 @@
case ${j#*/} in
intro.*)
;;
- infnan.3|fgetxattr.2|flistxattr.2|fremovexattr.2|fsetxattr.2|\
+ infnan.3|query_module.2|set_mempolicy.2)
+ echo -n "(skipped)"
+ ;;
+ fgetxattr.2|flistxattr.2|fremovexattr.2|fsetxattr.2|\
getxattr.2|lgetxattr.2|listxattr.2|llistxattr.2|lremovexattr.2|\
- query_module.2|set_mempolicy.2|\
lsetxattr.2|removexattr.2|setxattr.2)
- echo -n "(skipped)"
+ echo -n "(skipped, provided by libattr1-dev)"
;;
*)
read Y < $j
diff -Nru --exclude 'man?' --exclude 'Changes*' --exclude 'man-pages-*' manpages-3.42/Makefile manpages-3.44/Makefile
--- manpages-3.42/Makefile 2012-08-13 18:39:35.000000000 -0400
+++ manpages-3.44/Makefile 2012-11-07 09:24:38.000000000 -0400
@@ -55,5 +55,18 @@
install -m 644 "$$i"/* $(DESTDIR)$(MANDIR)/"$$i" || exit $$?; \
done; \
+# Check if groff reports warnings (may be words of sentances not displayed)
+# from http://lintian.debian.org/tags/manpage-has-errors-from-man.html
+GROFF_LOG := $(shell mktemp /tmp/manpages-checksXXXX)
+check-groff-warnings:
+ for i in man?/*.[1-9]; \
+ do \
+ if grep -q 'SH.*NAME' $$i; then \
+ LC_ALL=en_US.UTF-8 MANWIDTH=80 man --warnings -E UTF-8 -l $$i > /dev/null 2>$(GROFF_LOG); \
+ [ -s $(GROFF_LOG) ] && ( echo "$$i: " ; cat $(GROFF_LOG) ; echo "" ); \
+ rm $(GROFF_LOG) 2>/dev/null; \
+ fi \
+ done
+
# someone might also want to look at /var/catman/cat2 or so ...
# a problem is that the location of cat pages varies a lot
Attachment:
signature.asc
Description: OpenPGP digital signature