diff --git a/debian/changelog b/debian/changelog index f865cf1f..c7566f02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shadow (1:4.13+dfsg1-4) unstable; urgency=medium + + [ Helmut Grohne ] + * DEP17: Move login and shadowconfig to /usr. (Closes: #1059915) + + -- Serge Hallyn Sun, 04 Feb 2024 20:28:27 +0000 + shadow (1:4.13+dfsg1-3) unstable; urgency=medium * Team upload diff --git a/debian/login.install b/debian/login.install index 9f706476..96fe109f 100644 --- a/debian/login.install +++ b/debian/login.install @@ -4,4 +4,4 @@ sbin/nologin usr/sbin usr/bin/faillog usr/bin/lastlog usr/bin/newgrp -bin/login +bin/login usr/bin diff --git a/debian/passwd.install b/debian/passwd.install index 0f9242cd..4feedc1d 100644 --- a/debian/passwd.install +++ b/debian/passwd.install @@ -1,5 +1,5 @@ debian/default/useradd etc/default -debian/shadowconfig sbin +debian/shadowconfig usr/sbin usr/bin/chage usr/bin/chfn usr/bin/chsh diff --git a/debian/rules b/debian/rules index da3c3810..b7ff08bd 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,7 @@ endif dh_install -a ifeq ($(DEB_HOST_ARCH_OS),hurd) # /bin/login is provided by the hurd package. - rm -f debian/login/bin/login + rm -f debian/login/usr/bin/login endif override_dh_installpam: