diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:41:10 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 19:41:10 +0000 |
| commit | 8642e3d5ff7bce9f99fd1120c5a9447cf662263d (patch) | |
| tree | 25299572aa600e31bf51ca3503fd8d1f50eb09cf | |
| parent | Merging upstream version 6.7. (diff) | |
| download | manpages-8642e3d5ff7bce9f99fd1120c5a9447cf662263d.tar.xz manpages-8642e3d5ff7bce9f99fd1120c5a9447cf662263d.zip | |
Merging debian version 6.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
24 files changed, 309 insertions, 255 deletions
diff --git a/debian/changelog b/debian/changelog index c450a13..c8472db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +manpages (6.7-1) unstable; urgency=medium + + * New upstream version 6.7 + * Remove exceptions in d/rules. + * Refresh patches. + * Add workaround for proc_config.gz.5 installation as + dh_installman believes that is a compressed file. + * Add to d/move_links_to_correct_package: + ~ man7/sigevent.7 + * Fix links also in section 7 manpages. + * Add missing GPL-3 license. + * Update d/copyright. + * Remove unused Lintian overrides. + * Add cpplint,cppcheck and lzip to Build-Depends (needed for tests). + * Export needed locale in d/rules (LC_ALL=C.UTF-8). + + -- Marcos Fouces <marcos@debian.org> Sun, 31 Mar 2024 22:57:48 +0200 + manpages (6.05.01-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index e04c533..e5fd875 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Dr. Tobias Quathamer <toddy@debian.org> XSBC-Original-Uploaders: Marcos Fouces <marcos@debian.org> Bugs: mailto:maintainers@lists.progress-linux.org Priority: standard -Build-Depends: debhelper-compat (= 13), groff (>= 1.23.0), mandoc +Build-Depends: debhelper-compat (= 13), groff (>= 1.23.0), groff-base, bsdextrautils, bzip2, binutils, clang, clang-tidy, cpp, cppcheck, cpplint, diffoscope, git, iwyu, lzip, man, mandoc, moreutils, pkgconf, xz-utils Standards-Version: 4.6.2 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/manpages Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/manpages @@ -30,7 +30,7 @@ Description: Manual pages about using a GNU/Linux system 7 = Conventions and standards, macro packages, etc. (e.g. nroff, ascii). . - Beside the intro man page describing the section, a few manual + Beside the intro man page describing the section, a few manual pages from sections 1,6 and 8 are also provided. . The man pages describe syntaxes of several system files. diff --git a/debian/copyright b/debian/copyright index cc7f451..a8be500 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,15 @@ Source: https://www.kernel.org/pub/linux/docs/man-pages/ Files: * Copyright: © 2005-2021 Michael Kerrisk <mtk.manpages@gmail.com> - © 2022-2023 Alejandro Colomar <alx@kernel.org> + © 2022-2024 Alejandro Colomar <alx@kernel.org> +License: GPL-2+ + +Files: debian/* +Copyright: © 1996-2010 Joey Schulze <joey@infodrom.org> + © 1997-2001 Nicolás Lichtmaier <nick@debian.org> + © 2011-2015 Simon Paillard <spaillard@debian.org> + © 2015-2024 Dr. Tobias Quathamer <toddy@debian.org> + © 2022-2024 Marcos Fouces <marcos@debian.org> License: GPL-2+ Files: scripts/* @@ -14,17 +22,9 @@ Copyright: © 2005-2008 & 2013 Michael Kerrisk <mtk.manpages@gmail.com> © 2020-2023 Alejandro Colomar <alx@kernel.org> License: GPL-2+ -Files: share/* +Files: share/mk/* Copyright: © 2021-2023 Alejandro Colomar <alx@kernel.org> -License: GPL-3+ - -Files: debian/* -Copyright: © 1996-2010 Joey Schulze <joey@infodrom.org> - © 1997-2001 Nicolás Lichtmaier <nick@debian.org> - © 2011-2015 Simon Paillard <spaillard@debian.org> - © 2015-2021 Dr. Tobias Quathamer <toddy@debian.org> - © 2022-2023 Marcos Fouces <marcos@debian.org> -License: GPL-2+ +License: LGPL-3.0 with LGPL-3.0-linking exception Files: man3head/sysexits.h.3head Copyright: (c) 1996 Joerg Wunsch @@ -67,10 +67,9 @@ Files: man3/CIRCLEQ_EMPTY.3 man3/CIRCLEQ_ENTRY.3 man3/CIRCLEQ_FIRST.3 man3/TAILQ_NEXT.3 man3/TAILQ_PREV.3 man3/TAILQ_REMOVE.3 man3/TAILQ_SWAP.3 man3/circleq.3 man3/forkpty.3 man3/getloadavg.3 man3/list.3 man3/login_tty.3 man3/openpty.3 man3/queue.3 - man3/simpleq.3 man3/slist.3 man3/stailq.3 man3/stpecpy.3 - man3/stpecpyx.3 man3/tailq.3 man3/ustpcpy.3 man3/ustr2stp.3 - man3/zustr2stp.3 man3/zustr2ustp.3 man7/operator.7 man7/precedence.7 - man7/queue.7 man7/string_copying.7 man7/symlink.7 + man3/simpleq.3 man3/slist.3 man3/stailq.3 man3/tailq.3 + man7/operator.7 man7/precedence.7 man7/queue.7 man7/string_copying.7 + man7/symlink.7 Copyright: (C) 2008, 2014 Michael Kerrisk <mtk.manpages@gmail.com> (c) 1989, 1990, 1993 (c) 1989, 1991, 1993 @@ -138,7 +137,7 @@ Copyright: (c) 1983 The Regents of the University of California. License: BSD-4-clause and Linux-man-pages-copyleft Files: man7/futex.7 -Copyright: Bert Hubert +Copyright: (could not be detected automatically) License: Expat Files: man1/ldd.1 man1/time.1 man2/__clone2.2 man2/capget.2 man2/capset.2 @@ -248,7 +247,7 @@ Copyright: (C) 2006 Red Hat, Inc. All rights reserved. (C) 2011, Hewlett-Packard Development Company, L.P. (C) 2016, PMC-Sierra, Inc. (C) 2016-2018, Microsemi Corporation - (C) 2019, Microchip Technology Inc. and its subsidiaries + (C) 2019-2023, Microchip Technology Inc. and its subsidiaries (c) 2007 Silicon Graphics, Inc. All Rights Reserved (c) 2008 Silicon Graphics, Inc. License: GPL-2 @@ -345,50 +344,46 @@ Files: man1/getent.1 man1/iconv.1 man1/localedef.1 man1/memusage.1 man4/mem.4 man4/null.4 man4/port.4 man4/ram.4 man4/random.4 man4/rtc.4 man4/sk98lin.4 man4/tty.4 man4/ttyS.4 man4/urandom.4 man4/vcs.4 man4/vcsa.4 man4/veth.4 man4/zero.4 man5/charmap.5 - man5/dir_colors.5 - man5/filesystems.5 man5/fs.5 man5/ftpusers.5 man5/group.5 - man5/host.conf.5 man5/hosts.5 man5/intro.5 man5/issue.5 man5/locale.5 - man5/motd.5 man5/networks.5 man5/nologin.5 man5/nscd.conf.5 - man5/nsswitch.conf.5 man5/passwd.5 man5/proc.5 man5/procfs.5 - man5/protocols.5 man5/repertoiremap.5 man5/securetty.5 man5/shells.5 - man5/termcap.5 man5/ttytype.5 man5/utmp.5 man5/utmpx.5 man5/wtmp.5 - man6/intro.6 man7/armscii-8.7 man7/ascii.7 man7/attributes.7 - man7/bootparam.7 man7/charsets.7 man7/cp1251.7 man7/cp1252.7 - man7/environ.7 man7/epoll.7 man7/glob.7 man7/intro.7 - man7/iso-8859-1.7 man7/iso-8859-10.7 man7/iso-8859-11.7 - man7/iso-8859-13.7 man7/iso-8859-14.7 man7/iso-8859-15.7 - man7/iso-8859-16.7 man7/iso-8859-2.7 man7/iso-8859-3.7 - man7/iso-8859-4.7 man7/iso-8859-5.7 man7/iso-8859-6.7 - man7/iso-8859-7.7 man7/iso-8859-8.7 man7/iso-8859-9.7 - man7/iso_8859-1.7 man7/iso_8859-10.7 man7/iso_8859-11.7 - man7/iso_8859-13.7 man7/iso_8859-14.7 man7/iso_8859-15.7 - man7/iso_8859-16.7 man7/iso_8859-2.7 man7/iso_8859-3.7 - man7/iso_8859-4.7 man7/iso_8859-5.7 man7/iso_8859-6.7 - man7/iso_8859-7.7 man7/iso_8859-8.7 man7/iso_8859-9.7 - man7/iso_8859_1.7 man7/iso_8859_10.7 man7/iso_8859_11.7 - man7/iso_8859_13.7 man7/iso_8859_14.7 man7/iso_8859_15.7 - man7/iso_8859_16.7 man7/iso_8859_2.7 man7/iso_8859_3.7 - man7/iso_8859_4.7 man7/iso_8859_5.7 man7/iso_8859_6.7 - man7/iso_8859_7.7 man7/iso_8859_8.7 man7/iso_8859_9.7 - man7/kernel_lockdown.7 man7/keyrings.7 man7/koi8-r.7 man7/koi8-u.7 - man7/latin1.7 man7/latin10.7 man7/latin2.7 man7/latin3.7 - man7/latin4.7 man7/latin5.7 man7/latin6.7 man7/latin7.7 man7/latin8.7 - man7/latin9.7 man7/persistent-keyring.7 man7/posixoptions.7 - man7/process-keyring.7 man7/sched.7 man7/session-keyring.7 - man7/sock_diag.7 man7/spufs.7 man7/standards.7 man7/thread-keyring.7 - man7/tis-620.7 man7/unicode.7 man7/user-keyring.7 - man7/user-session-keyring.7 man7/utf-8.7 man7/utf8.7 man7/xattr.7 - man8/iconvconfig.8 man8/intro.8 man8/ldconfig.8 man8/nscd.8 + man5/dir_colors.5 man5/filesystems.5 man5/fs.5 man5/ftpusers.5 + man5/group.5 man5/host.conf.5 man5/hosts.5 man5/intro.5 man5/issue.5 + man5/locale.5 man5/motd.5 man5/networks.5 man5/nologin.5 + man5/nscd.conf.5 man5/nsswitch.conf.5 man5/passwd.5 man5/protocols.5 + man5/repertoiremap.5 man5/securetty.5 man5/shells.5 man5/termcap.5 + man5/ttytype.5 man5/utmp.5 man5/utmpx.5 man5/wtmp.5 man6/intro.6 + man7/armscii-8.7 man7/ascii.7 man7/attributes.7 man7/bootparam.7 + man7/charsets.7 man7/cp1251.7 man7/cp1252.7 man7/environ.7 + man7/epoll.7 man7/glob.7 man7/intro.7 man7/iso-8859-1.7 + man7/iso-8859-10.7 man7/iso-8859-11.7 man7/iso-8859-13.7 + man7/iso-8859-14.7 man7/iso-8859-15.7 man7/iso-8859-16.7 + man7/iso-8859-2.7 man7/iso-8859-3.7 man7/iso-8859-4.7 + man7/iso-8859-5.7 man7/iso-8859-6.7 man7/iso-8859-7.7 + man7/iso-8859-8.7 man7/iso-8859-9.7 man7/iso_8859-1.7 + man7/iso_8859-10.7 man7/iso_8859-11.7 man7/iso_8859-13.7 + man7/iso_8859-14.7 man7/iso_8859-15.7 man7/iso_8859-16.7 + man7/iso_8859-2.7 man7/iso_8859-3.7 man7/iso_8859-4.7 + man7/iso_8859-5.7 man7/iso_8859-6.7 man7/iso_8859-7.7 + man7/iso_8859-8.7 man7/iso_8859-9.7 man7/iso_8859_1.7 + man7/iso_8859_10.7 man7/iso_8859_11.7 man7/iso_8859_13.7 + man7/iso_8859_14.7 man7/iso_8859_15.7 man7/iso_8859_16.7 + man7/iso_8859_2.7 man7/iso_8859_3.7 man7/iso_8859_4.7 + man7/iso_8859_5.7 man7/iso_8859_6.7 man7/iso_8859_7.7 + man7/iso_8859_8.7 man7/iso_8859_9.7 man7/kernel_lockdown.7 + man7/keyrings.7 man7/koi8-r.7 man7/koi8-u.7 man7/latin1.7 + man7/latin10.7 man7/latin2.7 man7/latin3.7 man7/latin4.7 + man7/latin5.7 man7/latin6.7 man7/latin7.7 man7/latin8.7 man7/latin9.7 + man7/persistent-keyring.7 man7/posixoptions.7 man7/process-keyring.7 + man7/sched.7 man7/session-keyring.7 man7/sock_diag.7 man7/spufs.7 + man7/standards.7 man7/thread-keyring.7 man7/tis-620.7 man7/unicode.7 + man7/user-keyring.7 man7/user-session-keyring.7 man7/utf-8.7 + man7/utf8.7 man7/xattr.7 man8/iconvconfig.8 man8/intro.8 + man8/ldconfig.8 man8/nscd.8 Copyright: (C) 1994 Jochen Hein (Hein@Student.TU-Clausthal.de) - (C) 1994, 1995 by Daniel Quinlan (quinlan@yggdrasil.com) (C) 1996 Andries Brouwer (aeb@cwi.nl) (C) 1999 Mike Coleman (mkc@acm.org) (C) 2000, 2002, 2007 Andreas Gruenbacher <agruen@suse.de> - (C) 2001 Martin Schulze <joey@infodrom.org> (C) 2001 Richard Braakman (C) 2001, 2002, 2004, 2007 Silicon Graphics, Inc. (C) 2002 Robert Love - (C) 2002-2008,2017 Michael Kerrisk <mtk.manpages@gmail.com> (C) 2003 Davide Libenzi (C) 2004 Alastair McKinstry (C) 2005 Lars Wirzenius @@ -534,6 +529,77 @@ Copyright: (C) 1993 David Metcalfe (david@prism.demon.co.uk) (c) 2012, Mark R. Bannister <cambridge@users.sourceforge.net> License: GPL-2+ and Linux-man-pages-copyleft +Files: man5/proc.5 man5/proc_apm.5 man5/proc_buddyinfo.5 man5/proc_bus.5 + man5/proc_cgroups.5 man5/proc_cmdline.5 man5/proc_config.gz.5 + man5/proc_cpuinfo.5 man5/proc_crypto.5 man5/proc_devices.5 + man5/proc_diskstats.5 man5/proc_dma.5 man5/proc_driver.5 + man5/proc_execdomains.5 man5/proc_fb.5 man5/proc_filesystems.5 + man5/proc_fs.5 man5/proc_ide.5 man5/proc_interrupts.5 + man5/proc_iomem.5 man5/proc_ioports.5 man5/proc_kallsyms.5 + man5/proc_kcore.5 man5/proc_key-users.5 man5/proc_keys.5 + man5/proc_kmsg.5 man5/proc_kpagecgroup.5 man5/proc_kpagecount.5 + man5/proc_kpageflags.5 man5/proc_ksyms.5 man5/proc_loadavg.5 + man5/proc_locks.5 man5/proc_malloc.5 man5/proc_meminfo.5 + man5/proc_modules.5 man5/proc_mounts.5 man5/proc_mtrr.5 + man5/proc_net.5 man5/proc_partitions.5 man5/proc_pci.5 + man5/proc_pid.5 man5/proc_pid_attr.5 man5/proc_pid_autogroup.5 + man5/proc_pid_auxv.5 man5/proc_pid_cgroup.5 + man5/proc_pid_clear_refs.5 man5/proc_pid_cmdline.5 + man5/proc_pid_comm.5 man5/proc_pid_coredump_filter.5 + man5/proc_pid_cpuset.5 man5/proc_pid_cwd.5 man5/proc_pid_environ.5 + man5/proc_pid_exe.5 man5/proc_pid_fd.5 man5/proc_pid_fdinfo.5 + man5/proc_pid_gid_map.5 man5/proc_pid_io.5 man5/proc_pid_limits.5 + man5/proc_pid_map_files.5 man5/proc_pid_maps.5 man5/proc_pid_mem.5 + man5/proc_pid_mountinfo.5 man5/proc_pid_mounts.5 + man5/proc_pid_mountstats.5 man5/proc_pid_net.5 man5/proc_pid_ns.5 + man5/proc_pid_numa_maps.5 man5/proc_pid_oom_adj.5 + man5/proc_pid_oom_score.5 man5/proc_pid_oom_score_adj.5 + man5/proc_pid_pagemap.5 man5/proc_pid_personality.5 + man5/proc_pid_projid_map.5 man5/proc_pid_root.5 + man5/proc_pid_seccomp.5 man5/proc_pid_setgroups.5 + man5/proc_pid_smaps.5 man5/proc_pid_stack.5 man5/proc_pid_stat.5 + man5/proc_pid_statm.5 man5/proc_pid_status.5 man5/proc_pid_syscall.5 + man5/proc_pid_task.5 man5/proc_pid_timers.5 + man5/proc_pid_timerslack_ns.5 man5/proc_pid_uid_map.5 + man5/proc_pid_wchan.5 man5/proc_profile.5 man5/proc_scsi.5 + man5/proc_self.5 man5/proc_slabinfo.5 man5/proc_stat.5 + man5/proc_swaps.5 man5/proc_sys.5 man5/proc_sys_abi.5 + man5/proc_sys_debug.5 man5/proc_sys_dev.5 man5/proc_sys_fs.5 + man5/proc_sys_kernel.5 man5/proc_sys_net.5 man5/proc_sys_proc.5 + man5/proc_sys_sunrpc.5 man5/proc_sys_user.5 man5/proc_sys_vm.5 + man5/proc_sysrq-trigger.5 man5/proc_sysvipc.5 man5/proc_thread-self.5 + man5/proc_tid.5 man5/proc_tid_children.5 man5/proc_timer_list.5 + man5/proc_timer_stats.5 man5/proc_tty.5 man5/proc_uptime.5 + man5/proc_version.5 man5/proc_vmstat.5 man5/proc_zoneinfo.5 + man5/procfs.5 +Copyright: (C) , Alan Cox <A.Cox@swansea.ac.uk> + (C) , Andries Brouwer <aeb@cwi.nl> + (C) , Michael Neuffer <neuffer@mail.uni-mainz.de> + (C) 1994, 1995, Daniel Quinlan <quinlan@yggdrasil.com) + (C) 1994, 1995, Daniel Quinlan <quinlan@yggdrasil.com> + (C) 2002-2008, 2017, Michael Kerrisk <mtk.manpages@gmail.com> + (C) 2023, Alejandro Colomar <alx@kernel.org> +License: GPL-3 + +Files: man2/getcpu.2 man2/sendfile.2 man2/sendfile64.2 man3/CMSG_ALIGN.3 + man3/CMSG_DATA.3 man3/CMSG_FIRSTHDR.3 man3/CMSG_LEN.3 + man3/CMSG_NXTHDR.3 man3/CMSG_SPACE.3 man3/cmsg.3 man3/rtnetlink.3 + man7/arp.7 man7/fifo.7 man7/icmp.7 man7/ip.7 man7/ipv6.7 + man7/netdevice.7 man7/packet.7 man7/raw.7 man7/rtnetlink.7 + man7/socket.7 man7/tcp.7 man7/udp.7 man7/unix.7 man7/x25.7 +Copyright: (C) 1998 Heiner Eisen. + (C) 1998 Pawel Krawczyk. + (C) 1999 Andi Kleen <ak@muc.de>, + (C) 1999 Andi Kleen <ak@muc.de>. + (C) 1999 Claus Fischer. + (C) 1999 Matthew Wilcox <willy@bofh.ai>. + (C) 2000 Andi Kleen <ak@muc.de>. + (C) 2006 Andi Kleen <ak@muc.de>. + (C) 2008 Michael Kerrisk <mtk.manpages@gmail.com> + (C) 2008-2014, Michael Kerrisk <mtk.manpages@gmail.com>, + (C) 2016, Heinrich Schuchardt <xypron.glpk@gmx.de> +License: Linux-man-pages-1-para + Files: man1/intro.1 man1/locale.1 man1/pldd.1 man1/sprof.1 man2/_Exit.2 man2/_exit.2 man2/_llseek.2 man2/_newselect.2 man2/_sysctl.2 man2/access.2 man2/alarm.2 man2/alloc_hugepages.2 man2/arch_prctl.2 @@ -559,15 +625,15 @@ Files: man1/intro.1 man1/locale.1 man1/pldd.1 man1/sprof.1 man2/_Exit.2 man2/getresuid32.2 man2/getrlimit.2 man2/getrusage.2 man2/gettid.2 man2/gettimeofday.2 man2/getuid.2 man2/getuid32.2 man2/getunwind.2 man2/idle.2 man2/init_module.2 man2/intro.2 man2/ioctl_fat.2 - man2/ioctl_iflags.2 man2/ioctl_ns.2 man2/ioctl_pipe.2 - man2/ioctl_userfaultfd.2 - man2/iopl.2 man2/kcmp.2 man2/kexec_file_load.2 man2/kexec_load.2 - man2/keyctl.2 man2/kill.2 man2/landlock_add_rule.2 - man2/landlock_create_ruleset.2 man2/landlock_restrict_self.2 - man2/lchown.2 man2/lchown32.2 man2/link.2 man2/linkat.2 man2/llseek.2 - man2/lookup_dcookie.2 man2/lstat.2 man2/lstat64.2 man2/madvise.2 - man2/membarrier.2 man2/mincore.2 man2/mmap.2 man2/mmap2.2 - man2/mount.2 man2/mount_setattr.2 man2/mprotect.2 + man2/ioctl_iflags.2 man2/ioctl_ns.2 man2/ioctl_pagemap_scan.2 + man2/ioctl_pipe.2 man2/ioctl_userfaultfd.2 man2/iopl.2 man2/kcmp.2 + man2/kexec_file_load.2 man2/kexec_load.2 man2/keyctl.2 man2/kill.2 + man2/landlock_add_rule.2 man2/landlock_create_ruleset.2 + man2/landlock_restrict_self.2 man2/lchown.2 man2/lchown32.2 + man2/link.2 man2/linkat.2 man2/llseek.2 man2/lookup_dcookie.2 + man2/lstat.2 man2/lstat64.2 man2/madvise.2 man2/membarrier.2 + man2/mincore.2 man2/mmap.2 man2/mmap2.2 man2/mount.2 + man2/mount_setattr.2 man2/move_pages.2 man2/mprotect.2 man2/mq_getsetattr.2 man2/mq_notify.2 man2/mq_open.2 man2/mq_timedreceive.2 man2/mq_timedsend.2 man2/mq_unlink.2 man2/msgctl.2 man2/msgget.2 man2/msgop.2 man2/msgrcv.2 man2/msgsnd.2 @@ -626,7 +692,8 @@ Files: man1/intro.1 man1/locale.1 man1/pldd.1 man1/sprof.1 man2/_Exit.2 man3/CPU_XOR_S.3 man3/CPU_ZERO.3 man3/CPU_ZERO_S.3 man3/FD_CLR.3 man3/FD_ISSET.3 man3/FD_SET.3 man3/FD_ZERO.3 man3/HUGE_VAL.3 man3/HUGE_VALF.3 man3/HUGE_VALL.3 man3/INFINITY.3 man3/MAX.3 - man3/MIN.3 man3/NAN.3 man3/_Generic.3 man3/_Static_assert.3 + man3/MIN.3 man3/NAN.3 man3/TIMESPEC_TO_TIMEVAL.3 + man3/TIMEVAL_TO_TIMESPEC.3 man3/_Generic.3 man3/_Static_assert.3 man3/__fbufsize.3 man3/__flbf.3 man3/__fpending.3 man3/__fpurge.3 man3/__freadable.3 man3/__freading.3 man3/__fsetlocking.3 man3/__fwritable.3 man3/__fwriting.3 man3/__ppc_get_timebase.3 @@ -791,20 +858,23 @@ Files: man1/intro.1 man1/locale.1 man1/pldd.1 man1/sprof.1 man2/_Exit.2 man3/pthread_attr_setstackaddr.3 man3/pthread_attr_setstacksize.3 man3/pthread_cancel.3 man3/pthread_cleanup_pop.3 man3/pthread_cleanup_pop_restore_np.3 man3/pthread_cleanup_push.3 - man3/pthread_cleanup_push_defer_np.3 man3/pthread_create.3 + man3/pthread_cleanup_push_defer_np.3 man3/pthread_cond_init.3 + man3/pthread_condattr_init.3 man3/pthread_create.3 man3/pthread_detach.3 man3/pthread_equal.3 man3/pthread_exit.3 man3/pthread_getaffinity_np.3 man3/pthread_getattr_default_np.3 man3/pthread_getattr_np.3 man3/pthread_getconcurrency.3 man3/pthread_getcpuclockid.3 man3/pthread_getname_np.3 - man3/pthread_getschedparam.3 man3/pthread_join.3 man3/pthread_kill.3 + man3/pthread_getschedparam.3 man3/pthread_join.3 + man3/pthread_key_create.3 man3/pthread_kill.3 man3/pthread_kill_other_threads_np.3 man3/pthread_mutex_consistent.3 - man3/pthread_mutex_consistent_np.3 man3/pthread_mutexattr_destroy.3 - man3/pthread_mutexattr_getpshared.3 + man3/pthread_mutex_consistent_np.3 man3/pthread_mutex_init.3 + man3/pthread_mutexattr_destroy.3 man3/pthread_mutexattr_getpshared.3 man3/pthread_mutexattr_getrobust.3 man3/pthread_mutexattr_getrobust_np.3 man3/pthread_mutexattr_init.3 + man3/pthread_mutexattr_setkind_np.3 man3/pthread_mutexattr_setpshared.3 man3/pthread_mutexattr_setrobust.3 - man3/pthread_mutexattr_setrobust_np.3 + man3/pthread_mutexattr_setrobust_np.3 man3/pthread_once.3 man3/pthread_rwlockattr_getkind_np.3 man3/pthread_rwlockattr_setkind_np.3 man3/pthread_self.3 man3/pthread_setaffinity_np.3 man3/pthread_setattr_default_np.3 @@ -935,9 +1005,9 @@ Files: man1/intro.1 man1/locale.1 man1/pldd.1 man1/sprof.1 man2/_Exit.2 man7/cgroup_namespaces.7 man7/cgroups.7 man7/credentials.7 man7/ddp.7 man7/fanotify.7 man7/feature_test_macros.7 man7/glibc.7 man7/hier.7 man7/inode.7 man7/inotify.7 man7/ipc_namespaces.7 man7/landlock.7 - man7/libc.7 man7/locale.7 man7/man-pages.7 man7/man.7 - man7/math_error.7 man7/mount_namespaces.7 man7/mq_overview.7 - man7/namespaces.7 man7/network_namespaces.7 man7/nptl.7 man7/numa.7 + man7/libc.7 man7/locale.7 man7/man-pages.7 man7/math_error.7 + man7/mount_namespaces.7 man7/mq_overview.7 man7/namespaces.7 + man7/network_namespaces.7 man7/nptl.7 man7/numa.7 man7/path_resolution.7 man7/pid_namespaces.7 man7/pipe.7 man7/pkeys.7 man7/pthreads.7 man7/pty.7 man7/random.7 man7/rtld-audit.7 man7/sem_overview.7 man7/shm_overview.7 man7/sigevent.7 @@ -968,7 +1038,7 @@ Copyright: (C) 1991, 1992 Linus Torvalds (C) 1996 Michael Haardt. (C) 1997 Andries Brouwer (aeb@cwi.nl) (C) 1997 John S. Kallal - (C) 1998 Alan Cox <alan@llwyncelyn.cymru> + (C) 1998 Alan Cox. (C) 1998 Andries Brouwer (aeb@cwi.nl) (C) 1998 Jamie Lokier; (C) 1999 Andries Brouwer (aeb@cwi.nl) @@ -1006,9 +1076,9 @@ Copyright: (C) 1991, 1992 Linus Torvalds (C) 2006 Michael Kerrisk (C) 2006 Michael Kerrisk <mtk.manpages@gmail.com> (C) 2006 Red Hat, Inc. All Rights Reserved. + (C) 2006 Silicon Graphics, Inc. (C) 2006, 2007 Michael Kerrisk <mtk.manpages@gmail.com> (C) 2006, 2008, 2013, 2014 Michael Kerrisk <mtk.manpages@gmail.com> - (C) 2006, 2010 Michael Kerrisk <mtk.manpages@gmail.com> (C) 2006, 2014 Michael Kerrisk (C) 2006, 2014 Michael Kerrisk <mtk.manpages@gmail.com> (C) 2006, 2014 Michael Kerrisk. @@ -1097,6 +1167,8 @@ Copyright: (C) 1991, 1992 Linus Torvalds (C) 2022 Alejandro Colomar <alx.manpages@gmail.com> (C) 2022 Alejandro Colomar <alx@kernel.org> (C) 2023 Alejandro Colomar <alx@kernel.org> + (C) 2023 Collabora; + (C) 2024 Alejandro Colomar <alx@kernel.org> (C) The Internet Society (1998). All Rights Reserved. (C), 1994, Graeme W. Wilford (Wilf). (C), 1994, Graeme W. Wilford. (Wilf.) @@ -1145,6 +1217,7 @@ Copyright: (C) 1991, 1992 Linus Torvalds (c) 2006, 2008 by Michael Kerrisk <mtk.manpages@gmail.com> (c) 2006, 2008, Michael Kerrisk (c) 2006, 2008, Michael Kerrisk <mtk.manpages@gmail.com> + (c) 2006, 2010, 2020, Michael Kerrisk <mtk.manpages@gmail.com> (c) 2006, 2014, Michael Kerrisk (c) 2006, Michael Kerrisk <mtk.manpages@gmail.com> (c) 2007 Michael Kerrisk <mtk.manpages@gmail.com> @@ -1208,9 +1281,11 @@ Copyright: (C) 1991, 1992 Linus Torvalds (c) 2020 by Alejandro Colomar <alx@kernel.org> (c) 2020 by Michael Kerrisk <mtk.manpages@gmail.com> (c) 2020-2022 by Alejandro Colomar <alx@kernel.org> + (c) 2020-2023, Alejandro Colomar <alx@kernel.org> (c) 2021 Michael Kerrisk <mtk.manpages@gmail.com> (c) 2021 by Christian Brauner <christian.brauner@ubuntu.com> (c) 2022 by Alejandro Colomar <alx@kernel.org> + (c) 2022 by Cyril Hrubis <chrubi@suse.cz> (c) 2022 by Thomas Voss <mail@thomasvoss.com> 1991, 1992 Free Software Foundation 1992 Rickard E. Faith (faith@cs.unc.edu) @@ -1254,6 +1329,7 @@ Copyright: (C) 1991, 1992 Linus Torvalds 2006-2008, Michael Kerrisk <mtk.manpages@gmail.com> 2007 (C) Michael Kerrisk <mtk.manpages@gmail.com> 2007 Michael Kerrisk <mtk.manpages@gmail.com> + 2007, 2012, 2018, Michael Kerrisk <mtk.manpages@gmail.com> 2008 Michael Kerrisk <mtk.manpages@gmail.com> 2008, 2015 Michael Kerrisk <mtk.manpages@gmail.com> 2008, Linux Foundation, written by Michael Kerrisk @@ -1268,16 +1344,25 @@ Copyright: (C) 1991, 1992 Linus Torvalds 2015 Michael Kerrisk <mtk.manpages@gmail.com> 2015-2017 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> 2020 Michael Kerrisk <mtk.manpages@gmail.com> - 2022-2023 Alejandro Colomar <alx@kernel.org> - 2022 Cyril Hubris <chrubi@suse.cz> - 2023 Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> + 2022 Alejandro Colomar <alx@kernel.org> + 2023, Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> + 2023, Alejandro Colomar <alx@kernel.org> Guillem Jover <guillem@hadrons.org> - i2007, 2012, 2018, Michael Kerrisk <mtk.manpages@gmail.com> © 2017-2020 Mickaël Salaün <mic@digikod.net> © 2019-2020 ANSSI © 2021 Microsoft Corporation License: Linux-man-pages-copyleft +Files: man2/migrate_pages.2 +Copyright: (C) 2006 Silicon Graphics, Inc. + 2009 Intel Corporation +License: Linux-man-pages-copyleft-2-para + +Files: man2/get_mempolicy.2 man2/mbind.2 man2/set_mempolicy.2 +Copyright: 2003,2004 Andi Kleen, SuSE Labs. + 2007 Lee Schermerhorn, Hewlett Packard +License: Linux-man-pages-copyleft-var + License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1427,22 +1512,51 @@ License: GPL-2+ License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. +License: GPL-3 + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. . - This package is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +License: LGPL-3.0 with LGPL-3.0-linking exception + This software is licensed under the LGPLv3, included in the link below. + . + As a special exception to the GNU Lesser General Public License version 3 + ("LGPL3"), the copyright holders of this Library give you permission to + convey to a third party a Combined Work that links statically or dynamically + to this Library without providing any Minimal Corresponding Source or + Minimal Application Code as set out in 4d or providing the installation + information set out in section 4e, provided that you comply with the other + provisions of LGPL3 and provided that you meet, for the Application the + terms and conditions of the license(s) which apply to the Application. + . + Except as stated in this special exception, the provisions of LGPL3 will + continue to comply in full to this Library. If you modify this Library, you + may apply this exception to your version of this Library, but you are not + obliged to do so. If you do not wish to do so, delete this exception + statement from your version. This exception does not (and cannot) modify any + license terms which apply to the Application, with which you must still + comply. . - On Debian systems, the complete text of the GNU General Public - License version 3 can be found in "/usr/share/common-licenses/GPL-3". + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-3 file. + +License: Linux-man-pages-1-para + Permission is granted to distribute possibly modified copies of this page + provided the header is included verbatim, and in case of nontrivial + modification author and date of the modification is added to the header. License: Linux-man-pages-copyleft Permission is granted to make and distribute verbatim copies of this manual @@ -1463,3 +1577,31 @@ License: Linux-man-pages-copyleft . Formatted or processed versions of this manual, if unaccompanied by the source, must acknowledge the copyright and authors of this work. + +License: Linux-man-pages-copyleft-2-para + Permission is granted to make and distribute verbatim copies of this manual + provided the copyright notice and this permission notice are preserved on all + copies. + . + Permission is granted to copy and distribute modified versions of this manual + under the conditions for verbatim copying, provided that the entire resulting + derived work is distributed under the terms of a permission notice identical + to this one. + +License: Linux-man-pages-copyleft-var + Permission is granted to make and distribute verbatim copies of this manual + provided the copyright notice and this permission notice are preserved on all + copies. + . + Permission is granted to copy and distribute modified versions of this manual + under the conditions for verbatim copying, provided that the entire resulting + derived work is distributed under the terms of a permission notice identical + to this one. + . + Since the Linux kernel and libraries are constantly changing, this manual page + may be incorrect or out-of-date. The author(s) assume no responsibility for + errors or omissions, or for damages resulting from the use of the information + contained herein. + . + Formatted or processed versions of this manual, if unaccompanied by the + source, must acknowledge the copyright and authors of this work. diff --git a/debian/licenses/GPL-3 b/debian/licenses/GPL-3 new file mode 100644 index 0000000..005e5f0 --- /dev/null +++ b/debian/licenses/GPL-3 @@ -0,0 +1,16 @@ +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. +. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +. +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL-3 file. diff --git a/debian/manpages-dev.lintian-overrides b/debian/manpages-dev.lintian-overrides index 17f3b39..9bdaffa 100644 --- a/debian/manpages-dev.lintian-overrides +++ b/debian/manpages-dev.lintian-overrides @@ -1,8 +1,2 @@ # /var/adm/ only described as alternate path -manpages-dev: FSSTND-dir-in-manual-page /var/adm/ [usr/share/man/man3/gethostid.3.gz:126] - -# /var/adm/ only described as alternate path manpages-dev: FSSTND-dir-in-manual-page /var/adm/ [usr/share/man/man3/getlogin.3.gz:133] - -# /var/adm/ only described as alternate path -manpages-dev: FSSTND-dir-in-manual-page /var/adm/ [usr/share/man/man3/ttyslot.3.gz:131] diff --git a/debian/manpages.lintian-overrides b/debian/manpages.lintian-overrides index 5a8ceb4..3427965 100644 --- a/debian/manpages.lintian-overrides +++ b/debian/manpages.lintian-overrides @@ -1,8 +1,2 @@ # /var/catman/ only described as alternate path manpages: FSSTND-dir-in-manual-page /var/catman/ [usr/share/man/man7/hier.7.gz:508] - -# /usr/man/ only described as alternate path -manpages: FSSTND-dir-in-manual-page /usr/man/ [usr/share/man/man7/man.7.gz:415] - -# /usr/doc/ only described as alternate path -manpages: FSSTND-dir-in-manual-page /usr/doc/ [usr/share/man/man7/uri.7.gz:664] diff --git a/debian/move_links_to_correct_package b/debian/move_links_to_correct_package index 1503f48..0d98df9 100644 --- a/debian/move_links_to_correct_package +++ b/debian/move_links_to_correct_package @@ -26,7 +26,8 @@ check_breaks_replaces () { man3type/sigevent.3type man3type/sigval.3type man3type/siginfo_t.3type - man3/const/EXIT_FAILURE.3const" + man3const/EXIT_FAILURE.3const + man7/sigevent.7" file_is_known="no" for file in $known_files; do if [ "x$1" = "x$file" ]; then diff --git a/debian/patches/0001-fclose.3.patch b/debian/patches/0001-fclose.3.patch index 8feaf5b..111eaa1 100644 --- a/debian/patches/0001-fclose.3.patch +++ b/debian/patches/0001-fclose.3.patch @@ -6,11 +6,9 @@ Subject: fclose.3 man3/fclose.3 | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/man3/fclose.3 b/man3/fclose.3 -index 3694d54..585b08f 100644 --- a/man3/fclose.3 +++ b/man3/fclose.3 -@@ -34,6 +34,16 @@ function flushes the stream pointed to by +@@ -34,6 +34,16 @@ (writing any buffered output data using .BR fflush (3)) and closes the underlying file descriptor. diff --git a/debian/patches/0002-getpwent.3.patch b/debian/patches/0002-getpwent.3.patch index 50c3c83..17c205c 100644 --- a/debian/patches/0002-getpwent.3.patch +++ b/debian/patches/0002-getpwent.3.patch @@ -6,8 +6,6 @@ Subject: getpwent.3 man3/getpwent.3 | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -diff --git a/man3/getpwent.3 b/man3/getpwent.3 -index c46af20..839c614 100644 --- a/man3/getpwent.3 +++ b/man3/getpwent.3 @@ -9,7 +9,8 @@ @@ -18,9 +16,9 @@ index c46af20..839c614 100644 +.\" 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-07-20 "Linux man-pages 6.05.01" + .TH getpwent 3 2023-10-31 "Linux man-pages 6.7" .SH NAME -@@ -79,6 +80,21 @@ struct passwd { +@@ -79,6 +80,21 @@ }; .EE .in @@ -39,10 +37,10 @@ index c46af20..839c614 100644 +may be empty, in which case the system will execute the default shell +.RB ( /bin/sh ) +for the user. - .PP + .P For more information about the fields of this structure, see .BR passwd (5). -@@ -188,4 +204,6 @@ POSIX.1-2001, SVr4, 4.3BSD. +@@ -188,4 +204,6 @@ .BR getpwnam (3), .BR getpwuid (3), .BR putpwent (3), diff --git a/debian/patches/0003-getpwnam.3.patch b/debian/patches/0003-getpwnam.3.patch index 83b18cc..1cbe605 100644 --- a/debian/patches/0003-getpwnam.3.patch +++ b/debian/patches/0003-getpwnam.3.patch @@ -6,11 +6,9 @@ Subject: getpwnam.3 man3/getpwnam.3 | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/man3/getpwnam.3 b/man3/getpwnam.3 -index 3e6af83..ac7262b 100644 --- a/man3/getpwnam.3 +++ b/man3/getpwnam.3 -@@ -194,10 +194,18 @@ structure. +@@ -194,10 +194,18 @@ .TP .B ERANGE Insufficient buffer space supplied. @@ -29,7 +27,7 @@ index 3e6af83..ac7262b 100644 .SH ATTRIBUTES For an explanation of the terms used in this section, see .BR attributes (7). -@@ -348,4 +356,5 @@ main(int argc, char *argv[]) +@@ -347,4 +355,5 @@ .BR getspnam (3), .BR putpwent (3), .BR setpwent (3), diff --git a/debian/patches/0004-nl_langinfo.3.patch b/debian/patches/0004-nl_langinfo.3.patch index 0eba6bf..716b320 100644 --- a/debian/patches/0004-nl_langinfo.3.patch +++ b/debian/patches/0004-nl_langinfo.3.patch @@ -6,16 +6,14 @@ Subject: nl_langinfo.3 man3/nl_langinfo.3 | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/man3/nl_langinfo.3 b/man3/nl_langinfo.3 -index 2726c29..0efe203 100644 --- a/man3/nl_langinfo.3 +++ b/man3/nl_langinfo.3 -@@ -56,6 +56,8 @@ which was previously created by +@@ -56,6 +56,8 @@ .BR newlocale (3). Individual and additional elements of the locale categories can be queried. +.BR setlocale (3) +needs to be executed with proper arguments before. - .PP + .P Examples for the locale elements that can be specified in \fIitem\fP using the constants defined in \fI<langinfo.h>\fP are: diff --git a/debian/patches/0005-console_codes.4.patch b/debian/patches/0005-console_codes.4.patch index 4e6afd0..9f71c73 100644 --- a/debian/patches/0005-console_codes.4.patch +++ b/debian/patches/0005-console_codes.4.patch @@ -6,8 +6,6 @@ Subject: console_codes.4 man4/console_codes.4 | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/man4/console_codes.4 b/man4/console_codes.4 -index e2ac4e8..e67a1f3 100644 --- a/man4/console_codes.4 +++ b/man4/console_codes.4 @@ -14,6 +14,7 @@ @@ -16,9 +14,9 @@ index e2ac4e8..e67a1f3 100644 .\" 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 2023-02-05 "Linux man-pages 6.05.01" + .TH console_codes 4 2024-01-28 "Linux man-pages 6.7" .SH NAME -@@ -716,7 +717,9 @@ ESC m Memory unlock (per HP terminals). +@@ -717,7 +718,9 @@ ESC n LS2 Invoke the G2 character set. ESC o LS3 Invoke the G3 character set. ESC | LS3R Invoke the G3 character set as GR. @@ -27,4 +25,4 @@ index e2ac4e8..e67a1f3 100644 + Has no visible effect in xterm. ESC \[ti] LS1R Invoke the G1 character set as GR. .TE - .PP + .P diff --git a/debian/patches/0006-dir_colors.5.patch b/debian/patches/0006-dir_colors.5.patch index cb4593b..1fb6b71 100644 --- a/debian/patches/0006-dir_colors.5.patch +++ b/debian/patches/0006-dir_colors.5.patch @@ -6,11 +6,9 @@ Subject: dir_colors.5 man5/dir_colors.5 | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/man5/dir_colors.5 b/man5/dir_colors.5 -index ccee252..3084d40 100644 --- a/man5/dir_colors.5 +++ b/man5/dir_colors.5 -@@ -374,8 +374,16 @@ hash mark as the first character. +@@ -374,8 +374,16 @@ .TP .I /etc/DIR_COLORS System-wide configuration file. @@ -20,10 +18,10 @@ index ccee252..3084d40 100644 +and thus Debian.) .TP .I \[ti]/.dir_colors -++.\" Rejected upstream ++.\" Rejected upstream +(Slackware, SuSE and RedHat only; ignored by GNU +.BR dircolors (1) +and thus Debian.) Per-user configuration file. - .PP + .P This page describes the diff --git a/debian/patches/0007-motd.5.patch b/debian/patches/0007-motd.5.patch index 90a7dc6..e1e7ee4 100644 --- a/debian/patches/0007-motd.5.patch +++ b/debian/patches/0007-motd.5.patch @@ -6,34 +6,27 @@ Subject: motd.5 man5/motd.5 | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/man5/motd.5 b/man5/motd.5 -index b506c95..f4c4748 100644 --- a/man5/motd.5 +++ b/man5/motd.5 -@@ -12,14 +12,26 @@ motd \- message of the day +@@ -12,12 +12,20 @@ The contents of .I /etc/motd are displayed by +-.BR login (1) +.\" Patched in Debian, maybe other distribs +.BR pam_motd (8) +.\" End of patch +.\" .BR login (1) - .BR login (1) after a successful login but just before it executes the login shell. - .PP + .P 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). -+.PP ++.P +On Debian GNU/Linux, dynamic content configured at +.I /etc/pam.d/login +is also displayed by -+.IR pam_exec . ++.I pam_exec .SH FILES .I /etc/motd -+.br -+.I /etc/pam.d/login .SH SEE ALSO - .BR login (1), - .BR issue (5) -+.BR pam_motd (8) diff --git a/debian/patches/0008-nsswitch.conf.5.patch b/debian/patches/0008-nsswitch.conf.5.patch index 4312e46..e0701af 100644 --- a/debian/patches/0008-nsswitch.conf.5.patch +++ b/debian/patches/0008-nsswitch.conf.5.patch @@ -6,11 +6,9 @@ Subject: nsswitch.conf.5 man5/nsswitch.conf.5 | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5 -index 49b288e..eb690ed 100644 --- a/man5/nsswitch.conf.5 +++ b/man5/nsswitch.conf.5 -@@ -274,6 +274,11 @@ Include the specified +@@ -274,6 +274,11 @@ .I user from the NIS passwd/shadow map. .TP diff --git a/debian/patches/0009-resolv.conf.5.patch b/debian/patches/0009-resolv.conf.5.patch index 29097ea..8bf9d92 100644 --- a/debian/patches/0009-resolv.conf.5.patch +++ b/debian/patches/0009-resolv.conf.5.patch @@ -6,11 +6,9 @@ Subject: resolv.conf.5 man5/resolv.conf.5 | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5 -index 1ea918d..a2677b2 100644 --- a/man5/resolv.conf.5 +++ b/man5/resolv.conf.5 -@@ -249,6 +249,8 @@ this option is deprecated; applications should use +@@ -249,6 +249,8 @@ .BR getaddrinfo (3), rather than .BR gethostbyname (3). diff --git a/debian/patches/0010-tzfile.5.patch b/debian/patches/0010-tzfile.5.patch index 0b8acc3..895df4c 100644 --- a/debian/patches/0010-tzfile.5.patch +++ b/debian/patches/0010-tzfile.5.patch @@ -6,11 +6,9 @@ Subject: tzfile.5 man5/tzfile.5 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -diff --git a/man5/tzfile.5 b/man5/tzfile.5 -index 59d9f6b..8bd9e77 100644 --- a/man5/tzfile.5 +++ b/man5/tzfile.5 -@@ -205,6 +205,22 @@ if either +@@ -210,6 +210,22 @@ .B tzh_timecnt is zero or the time argument is less than the first transition time recorded in the file. diff --git a/debian/patches/0011-man.7.patch b/debian/patches/0011-man.7.patch deleted file mode 100644 index ddc1474..0000000 --- a/debian/patches/0011-man.7.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: "Dr. Tobias Quathamer" <toddy@debian.org> -Date: Sat, 6 Feb 2016 01:27:54 +0100 -Subject: man.7 - ---- - man7/man.7 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/man7/man.7 b/man7/man.7 -index b0788f3..62c9f56 100644 ---- a/man7/man.7 -+++ b/man7/man.7 -@@ -500,6 +500,7 @@ is not implemented. - .BR lexgrog (1), - .BR man (1), - .BR man2html (1), -+.BR groff_mdoc (7), - .BR whatis (1), - .BR groff_man (7), - .BR groff_www (7), diff --git a/debian/patches/0013-rtnetlink.7.patch b/debian/patches/0013-rtnetlink.7.patch index 5815c1e..b9c5cd0 100644 --- a/debian/patches/0013-rtnetlink.7.patch +++ b/debian/patches/0013-rtnetlink.7.patch @@ -6,11 +6,9 @@ Subject: rtnetlink.7 man7/rtnetlink.7 | 1 + 1 file changed, 1 insertion(+) -diff --git a/man7/rtnetlink.7 b/man7/rtnetlink.7 -index 3b6465f..f710bbe 100644 --- a/man7/rtnetlink.7 +++ b/man7/rtnetlink.7 -@@ -13,6 +13,7 @@ rtnetlink \- Linux routing socket +@@ -13,6 +13,7 @@ .SH SYNOPSIS .nf .B #include <asm/types.h> diff --git a/debian/patches/0014-set-proper-installation-path.patch b/debian/patches/0014-set-proper-installation-path.patch index 3baeb79..bfd2eed 100644 --- a/debian/patches/0014-set-proper-installation-path.patch +++ b/debian/patches/0014-set-proper-installation-path.patch @@ -7,16 +7,14 @@ Forwarded: not-needed share/mk/install/_.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk -index 751ab97..bbf4ee2 100644 ---- a/share/mk/install/_.mk -+++ b/share/mk/install/_.mk -@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/cmd.mk +--- a/share/mk/configure/directory_variables.mk ++++ b/share/mk/configure/directory_variables.mk +@@ -13,7 +13,7 @@ - DESTDIR := --prefix := /usr/local -+prefix := /usr - + DESTDIR := +-prefix := /usr/local ++prefix := /usr datarootdir := $(prefix)/share 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 b446a05..c6f28ba 100644 --- a/debian/patches/0015-fix-groff-warning.patch +++ b/debian/patches/0015-fix-groff-warning.patch @@ -8,11 +8,9 @@ warnings about missing characters. man7/glob.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/man7/glob.7 b/man7/glob.7 -index 466701c..c5c4577 100644 --- a/man7/glob.7 +++ b/man7/glob.7 -@@ -195,7 +195,7 @@ where the string between "\fI[=\fP" and "\fI=]\fP" is any collating +@@ -195,7 +195,7 @@ element from its equivalence class, as defined for the current locale. For example, "\fI[[=a=]]\fP" might be equivalent diff --git a/debian/patches/series b/debian/patches/series index 98d3eaa..6f58cf7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,7 +8,6 @@ 0008-nsswitch.conf.5.patch 0009-resolv.conf.5.patch 0010-tzfile.5.patch -0011-man.7.patch 0013-rtnetlink.7.patch 0014-set-proper-installation-path.patch 0015-fix-groff-warning.patch diff --git a/debian/rules b/debian/rules index e4d646c..e159816 100755 --- a/debian/rules +++ b/debian/rules @@ -1,88 +1,24 @@ #! /usr/bin/make -f - +export LC_ALL=C.UTF-8 %: dh $@ override_dh_auto_configure: # adjust non-standard subsection dir names to FHS: - sed -i 's/\.so man3type/\.so man3/g' man3*/* + sed -i 's/\.so man3type/\.so man3/g' man[3,7]*/* sed -i 's/\.so man3const/\.so man3/g' man3*/* sed -i 's/\.so man3head/\.so man3/g' man3*/* override_dh_auto_build: # Nothing to be done here, we're using a custom installation. -override_dh_auto_test: - make -kj4 lint-man >/dev/null 2>&1 || : - touch .tmp/man/man2/splice.2.lint-man.mandoc.touch - touch .tmp/man/man7/bpf-helpers.7.lint-man.mandoc.touch - touch .tmp/man/man7/uri.7.lint-man.mandoc.touch - touch .tmp/man/man8/zic.8.lint-man.mandoc.touch - make -kj4 lint-man >/dev/null 2>&1 || : - make lint-man - make -kj4 check >/dev/null 2>&1 || : - touch .tmp/man/man1/iconv.1.cat.set - touch .tmp/man/man1/memusage.1.check-catman.touch - touch .tmp/man/man2/fanotify_init.2.cat.set - touch .tmp/man/man2/gettimeofday.2.cat.set - touch .tmp/man/man2/s390_sthyi.2.cat.set - touch .tmp/man/man3/clearenv.3.cat.set - touch .tmp/man/man3/isalpha.3.cat.set - touch .tmp/man/man3/mallopt.3.check-catman.touch - touch .tmp/man/man3/mbstowcs.3.cat.set - touch .tmp/man/man3/newlocale.3.cat.set - touch .tmp/man/man3/strcpy.3.cat.set - touch .tmp/man/man3/strfmon.3.cat.set - touch .tmp/man/man3/strncat.3.cat.set - touch .tmp/man/man3/unlocked_stdio.3.cat.set - touch .tmp/man/man4/console_codes.4.cat.set - touch .tmp/man/man4/lirc.4.cat.set - touch .tmp/man/man4/smartpqi.4.check-catman.touch - touch .tmp/man/man4/veth.4.check-catman.touch - touch .tmp/man/man5/proc.5.cat.set - touch .tmp/man/man5/slabinfo.5.check-catman.touch - touch .tmp/man/man5/tzfile.5.cat.set - touch .tmp/man/man7/address_families.7.cat.set - touch .tmp/man/man7/armscii-8.7.cat.set - touch .tmp/man/man7/ascii.7.cat.set - touch .tmp/man/man7/bpf-helpers.7.cat.set - touch .tmp/man/man7/charsets.7.cat.set - touch .tmp/man/man7/cp1251.7.cat.set - touch .tmp/man/man7/cp1252.7.cat.set - touch .tmp/man/man7/glob.7.cat.set - touch .tmp/man/man7/iso_8859-1.7.cat.set - touch .tmp/man/man7/iso_8859-10.7.cat.set - touch .tmp/man/man7/iso_8859-11.7.cat.set - touch .tmp/man/man7/iso_8859-13.7.cat.set - touch .tmp/man/man7/iso_8859-14.7.cat.set - touch .tmp/man/man7/iso_8859-15.7.cat.set - touch .tmp/man/man7/iso_8859-16.7.cat.set - touch .tmp/man/man7/iso_8859-2.7.cat.set - touch .tmp/man/man7/iso_8859-3.7.cat.set - touch .tmp/man/man7/iso_8859-4.7.cat.set - touch .tmp/man/man7/iso_8859-5.7.cat.set - touch .tmp/man/man7/iso_8859-6.7.cat.set - touch .tmp/man/man7/iso_8859-7.7.cat.set - touch .tmp/man/man7/iso_8859-8.7.cat.set - touch .tmp/man/man7/iso_8859-9.7.cat.set - touch .tmp/man/man7/keyrings.7.check-catman.touch - touch .tmp/man/man7/koi8-r.7.cat.set - touch .tmp/man/man7/koi8-u.7.cat.set - touch .tmp/man/man7/regex.7.cat.set - touch .tmp/man/man7/string_copying.7.cat.set - touch .tmp/man/man7/units.7.cat.set - touch .tmp/man/man7/uri.7.check-catman.touch - touch .tmp/man/man8/tzselect.8.cat.set - touch .tmp/man/man8/zdump.8.cat.set - touch .tmp/man/man8/zic.8.cat.set - make -kj4 check >/dev/null 2>&1 || : - make check - override_dh_installchangelogs: dh_installchangelogs Changes override_dh_installman: + mv debian/tmp/usr/share/man/man5/proc_config.gz.5 debian/tmp/usr/share/man/man5/proc_config_gz.5 dh_installman --language=C + mv debian/manpages/usr/share/man/man5/proc_config_gz.5 debian/manpages/usr/share/man/man5/proc_config.gz.5 # Prevent broken symlinks, see https://bugs.debian.org/876047 sh debian/move_links_to_correct_package # Remove intro.{2,3} manpages from manpages-dev, diff --git a/debian/update-copyright b/debian/update-copyright index 5a8b89e..a64d66f 100755 --- a/debian/update-copyright +++ b/debian/update-copyright @@ -75,6 +75,11 @@ license_information = [ ], }, { + "shortname": "GPL-3", + "filename": "GPL-3", + "upstream_names": ["GPL-3", "GPL-3+", "GPL-3.0-or-later"], + }, + { "shortname": "Linux-man-pages-1-para", "filename": "Linux-man-pages-1-para", "upstream_names": ["Linux-man-pages-1-para"], |