Am 02.07.2015 um 17:56 schrieb Manolo Díaz: > Package: udev > Version: 220-7 > Severity: normal > > Dear Maintainer, > > While /etc/udev/udev.conf is provided by the udev package, its man page > is provided by systemd. This bug is also present in version 221-1
Not only that, systemd also ships the udevadm completion for zsh, and the man pages for libnss-myhostname and libnss-mymachines, which should be shipped in those individual packages. Incidentally, we just discussed this the other day. I haven't pushed the attached patch yet since I haven't made up my mind, how to deal with those duplicate files, ie. whether to be explicit in our .install files and list the files individually or keeping our current setup to install all man pages into systemd and removing duplicates later one. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
commit 11dd7339838b9dfd16bcda2067b2a7b2c4948e2f Author: Michael Biebl <[email protected]> Date: Tue Jun 30 19:14:28 2015 +0200 Move a few man pages into correct packages diff --git a/debian/control b/debian/control index a47bd30..345277f 100644 --- a/debian/control +++ b/debian/control @@ -143,6 +143,8 @@ Section: admin Priority: extra Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: systemd (<< 221-2) +Replaces: systemd (<< 221-2) Description: nss module providing fallback resolution for the current hostname This package contains a plugin for the Name Service Switch, providing host name resolution for the locally configured system hostname as returned by @@ -163,6 +165,8 @@ Section: admin Priority: extra Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: systemd (<< 221-2) +Replaces: systemd (<< 221-2) Description: nss module to resolve hostnames for local container instances nss-mymachines is a plugin for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc) providing hostname resolution for local containers @@ -281,10 +285,11 @@ Depends: ${shlibs:Depends}, procps Breaks: consolekit (<< 0.4.6-1), kmod (<< 14), - systemd (<< 215-1), plymouth (<< 0.9.0-7), - bash-completion (<< 1:2.1) -Replaces: bash-completion (<< 1:2.1) + bash-completion (<< 1:2.1), + systemd (<< 221-2) +Replaces: bash-completion (<< 1:2.1), + systemd (<< 221-2) Description: /dev/ and hotplug management daemon udev is a daemon which dynamically creates and removes device nodes from /dev/, handles hotplug events and loads drivers at boot time. diff --git a/debian/libnss-myhostname.install b/debian/libnss-myhostname.install index 166e434..3db9104 100644 --- a/debian/libnss-myhostname.install +++ b/debian/libnss-myhostname.install @@ -1 +1,3 @@ lib/*/libnss_myhostname*.so.* +usr/share/man/man8/libnss_myhostname.so.2.8 +usr/share/man/man8/nss-myhostname.8 diff --git a/debian/libnss-mymachines.install b/debian/libnss-mymachines.install index 9f79d73..5530114 100644 --- a/debian/libnss-mymachines.install +++ b/debian/libnss-mymachines.install @@ -1 +1,3 @@ lib/*/libnss_mymachines*.so.* +usr/share/man/man8/libnss_mymachines.so.2.8 +usr/share/man/man8/nss-mymachines.8 diff --git a/debian/rules b/debian/rules index 46e564e..a62de48 100755 --- a/debian/rules +++ b/debian/rules @@ -201,6 +201,12 @@ endif rm debian/systemd/usr/share/man/man8/runlevel.8 # files shipped by libpam-systemd rm debian/systemd/usr/share/man/man8/pam_systemd.8 + # files shipped by libnss-myhostname + rm debian/systemd/usr/share/man/man8/libnss_myhostname.so.2.8 + rm debian/systemd/usr/share/man/man8/nss-myhostname.8 + # files shipped by libnss-mymachines + rm debian/systemd/usr/share/man/man8/libnss_mymachines.so.2.8 + rm debian/systemd/usr/share/man/man8/nss-mymachines.8 # files shipped by udev rm -r debian/systemd/etc/udev/ rm debian/systemd/lib/systemd/system/systemd-udev* @@ -208,12 +214,15 @@ endif rm debian/systemd/lib/systemd/system/*.target.wants/systemd-udev* rm debian/systemd/lib/systemd/system/*.target.wants/*hwdb* rm debian/systemd/lib/systemd/systemd-udevd + rm debian/systemd/usr/share/man/man5/udev.conf.5 + rm debian/systemd/usr/share/man/man7/hwdb.7 rm debian/systemd/usr/share/man/man7/udev.7 - rm debian/systemd/usr/share/man/man7/*hwdb*.7 - rm debian/systemd/usr/share/man/man8/*udev*.8 - rm debian/systemd/usr/share/man/man8/*hwdb*.8 + rm debian/systemd/usr/share/man/man8/systemd-hwdb* + rm debian/systemd/usr/share/man/man8/systemd-udevd* + rm debian/systemd/usr/share/man/man8/udevadm.8 + rm debian/systemd/usr/share/zsh/vendor-completions/_udevadm rm debian/systemd/usr/share/bash-completion/completions/udevadm - # files systemd by cryptsetup + # files shipped by cryptsetup ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES))) rm debian/systemd/usr/share/man/man5/crypttab.5 endif diff --git a/debian/udev.install b/debian/udev.install index fb3d8b0..8079224 100644 --- a/debian/udev.install +++ b/debian/udev.install @@ -7,11 +7,14 @@ lib/systemd/system/*.target.wants/*hwdb* lib/systemd/systemd-udevd bin/udevadm bin/systemd-hwdb +usr/share/man/man5/udev.conf.5 +usr/share/man/man7/hwdb.7 usr/share/man/man7/udev.7 -usr/share/man/man7/*hwdb*.7 -usr/share/man/man8/*udev*.8 -usr/share/man/man8/*hwdb*.8 +usr/share/man/man8/systemd-hwdb* +usr/share/man/man8/systemd-udevd* +usr/share/man/man8/udevadm.8 usr/share/bash-completion/completions/udevadm +usr/share/zsh/vendor-completions/_udevadm usr/share/pkgconfig/udev.pc ../../extra/initramfs-tools usr/share/ ../../extra/rules/*.rules lib/udev/rules.d/
signature.asc
Description: OpenPGP digital signature
