diff --git a/debian/control b/debian/control index eccc84f6..3de8dbf5 100644 --- a/debian/control +++ b/debian/control @@ -5,20 +5,21 @@ Uploaders: Chris Hofstaedtler Section: admin Priority: required -Build-Depends: debhelper-compat (= 13), - gettext, - libcrypt-dev, - libpam0g-dev, - quilt, - xsltproc , - docbook-xsl , - docbook-xml , - libxml2-utils , - libselinux1-dev [linux-any], - libsemanage-dev [linux-any], - itstool , - bison, - libaudit-dev [linux-any] +Build-Depends: + bison, + debhelper-compat (= 13), + docbook-xml , + docbook-xsl , + gettext, + itstool , + libaudit-dev [linux-any], + libcrypt-dev, + libpam0g-dev, + libselinux1-dev [linux-any], + libsemanage-dev [linux-any], + libxml2-utils , + quilt, + xsltproc Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/debian/shadow.git -b master Vcs-Browser: https://salsa.debian.org/debian/shadow @@ -28,10 +29,12 @@ Rules-Requires-Root: binary-targets Package: passwd Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libpam-modules -Recommends: sensible-utils +Depends: + libpam-modules, + ${misc:Depends}, + ${shlibs:Depends} +Recommends: + sensible-utils Description: change and administer password and group data This package includes passwd, chsh, chfn, and many other programs to maintain password and group data. @@ -42,13 +45,17 @@ Package: login Architecture: any Multi-Arch: foreign Essential: yes -Pre-Depends: ${shlibs:Depends}, - ${misc:Depends}, - libpam-runtime, - libpam-modules -Breaks: hurd (<< 20140206~) [hurd-any] -Conflicts: python-4suite (<< 0.99cvs20060405-1) -Replaces: hurd (<< 20140206~) [hurd-any] +Pre-Depends: + libpam-modules, + libpam-runtime, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: + hurd (<< 20140206~) [hurd-any] +Conflicts: + python-4suite (<< 0.99cvs20060405-1) +Replaces: + hurd (<< 20140206~) [hurd-any] Description: system login tools This package provides some required infrastructure for logins and for changing effective user or group IDs, including: @@ -59,8 +66,9 @@ Package: uidmap Architecture: any Multi-Arch: foreign Priority: optional -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} Description: programs to help use subuids These programs help unprivileged users to create uid and gid mappings in user namespaces. @@ -70,8 +78,11 @@ Section: libs Priority: optional Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: + ${misc:Pre-Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} Description: subordinate id handling library -- shared library The library provides an interface for querying, granding and ungranting subordinate user and group ids. @@ -81,7 +92,9 @@ Section: libdevel Priority: optional Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, libsubid4 (= ${binary:Version}) +Depends: + libsubid4 (= ${binary:Version}), + ${misc:Depends} Description: subordinate id handling library -- shared library The library provides an interface for querying, granding and ungranting subordinate user and group ids. diff --git a/debian/login.install b/debian/login.install index 2808e31b..fd8bd122 100644 --- a/debian/login.install +++ b/debian/login.install @@ -1,6 +1,6 @@ +bin/login usr/bin debian/login.defs etc -usr/share/locale/*/LC_MESSAGES/shadow.mo sbin/nologin usr/sbin usr/bin/faillog usr/bin/newgrp -bin/login usr/bin +usr/share/locale/*/LC_MESSAGES/shadow.mo diff --git a/debian/passwd.dirs b/debian/passwd.dirs index d2a6c07f..dca90274 100644 --- a/debian/passwd.dirs +++ b/debian/passwd.dirs @@ -1,2 +1,2 @@ -usr/share/lintian/overrides etc/default +usr/share/lintian/overrides diff --git a/debian/passwd.install b/debian/passwd.install index 4feedc1d..f2cb3e34 100644 --- a/debian/passwd.install +++ b/debian/passwd.install @@ -6,13 +6,13 @@ usr/bin/chsh usr/bin/expiry usr/bin/gpasswd usr/bin/passwd -usr/sbin/chpasswd usr/sbin/chgpasswd +usr/sbin/chpasswd usr/sbin/cppw usr/sbin/groupadd usr/sbin/groupdel -usr/sbin/groupmod usr/sbin/groupmems +usr/sbin/groupmod usr/sbin/grpck usr/sbin/grpconv usr/sbin/grpunconv diff --git a/debian/passwd.links b/debian/passwd.links index 57b529ea..3d7cc843 100644 --- a/debian/passwd.links +++ b/debian/passwd.links @@ -1,2 +1,2 @@ -usr/sbin/vipw usr/sbin/vigr usr/sbin/cppw usr/sbin/cpgr +usr/sbin/vipw usr/sbin/vigr diff --git a/debian/passwd.manpages b/debian/passwd.manpages index 8e552c8b..fee633be 100644 --- a/debian/passwd.manpages +++ b/debian/passwd.manpages @@ -6,17 +6,17 @@ usr/share/man/*/man1/chsh.1 usr/share/man/*/man1/expiry.1 usr/share/man/*/man1/gpasswd.1 usr/share/man/*/man1/passwd.1 +usr/share/man/*/man5/gshadow.5 usr/share/man/*/man5/passwd.5 +usr/share/man/*/man5/shadow.5 usr/share/man/*/man5/subgid.5 usr/share/man/*/man5/subuid.5 -usr/share/man/*/man5/shadow.5 -usr/share/man/*/man5/gshadow.5 -usr/share/man/*/man8/chpasswd.8 usr/share/man/*/man8/chgpasswd.8 +usr/share/man/*/man8/chpasswd.8 usr/share/man/*/man8/groupadd.8 usr/share/man/*/man8/groupdel.8 -usr/share/man/*/man8/groupmod.8 usr/share/man/*/man8/groupmems.8 +usr/share/man/*/man8/groupmod.8 usr/share/man/*/man8/grpck.8 usr/share/man/*/man8/grpconv.8 usr/share/man/*/man8/grpunconv.8 @@ -35,11 +35,11 @@ usr/share/man/man1/chsh.1 usr/share/man/man1/expiry.1 usr/share/man/man1/gpasswd.1 usr/share/man/man1/passwd.1 +usr/share/man/man5/gshadow.5 usr/share/man/man5/passwd.5 usr/share/man/man5/shadow.5 -usr/share/man/man5/gshadow.5 -usr/share/man/man5/subuid.5 usr/share/man/man5/subgid.5 +usr/share/man/man5/subuid.5 usr/share/man/man8/chgpasswd.8 usr/share/man/man8/chpasswd.8 usr/share/man/man8/groupadd.8 diff --git a/debian/uidmap.install b/debian/uidmap.install index 48eb9e19..38246485 100644 --- a/debian/uidmap.install +++ b/debian/uidmap.install @@ -1,3 +1,3 @@ bin/getsubids usr/bin -usr/bin/newuidmap usr/bin/newgidmap +usr/bin/newuidmap