[Pkg-shadow-commits] r716 - trunk/debian

[Christine Spang]

Author: christine-guest
Date: 2005-12-16 19:12:44 +0000 (Fri, 16 Dec 2005)
New Revision: 716

Added:
   trunk/debian/login.install
   trunk/debian/passwd.install
Removed:
   trunk/debian/login.files
   trunk/debian/passwd.files
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Use dh_install instead of old dh_movefiles for moving files out of
temp dir during package build.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/changelog	2005-12-16 19:12:44 UTC (rev 716)
@@ -15,6 +15,10 @@
       Closes: #342858
   * Debconf translation updates:
     - Basque updated. Closes: #342102
+  * Debian packaging fixes:
+    - debian/rules, debian/login.files, debian/passwd.files:
+      Use dh_install instead of old dh_movefiles for moving files from
+      debian/tmp and rename {login, passwd}.files to {login,passwd}.install
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 21 Nov 2005 20:33:40 +0100
 

Deleted: trunk/debian/login.files
===================================================================
--- trunk/debian/login.files	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/login.files	2005-12-16 19:12:44 UTC (rev 716)
@@ -1,22 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/shadow.mo
-usr/share/man/*/man1/login.1
-usr/share/man/*/man1/newgrp.1
-usr/share/man/*/man1/sg.1
-usr/share/man/*/man1/su.1
-usr/share/man/*/man5/faillog.5
-usr/share/man/*/man5/login.defs.5
-usr/share/man/*/man8/faillog.8
-usr/share/man/*/man8/lastlog.8
-usr/share/man/man1/login.1
-usr/share/man/man1/newgrp.1
-usr/share/man/man1/sg.1
-usr/share/man/man1/su.1
-usr/share/man/man5/faillog.5
-usr/share/man/man5/login.defs.5
-usr/share/man/man8/faillog.8
-usr/share/man/man8/lastlog.8
-usr/bin/faillog
-usr/bin/lastlog
-usr/bin/newgrp
-bin/login
-bin/su

Added: trunk/debian/login.install
===================================================================
--- trunk/debian/login.install	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/login.install	2005-12-16 19:12:44 UTC (rev 716)
@@ -0,0 +1,22 @@
+usr/share/locale/*/LC_MESSAGES/shadow.mo
+usr/share/man/*/man1/login.1
+usr/share/man/*/man1/newgrp.1
+usr/share/man/*/man1/sg.1
+usr/share/man/*/man1/su.1
+usr/share/man/*/man5/faillog.5
+usr/share/man/*/man5/login.defs.5
+usr/share/man/*/man8/faillog.8
+usr/share/man/*/man8/lastlog.8
+usr/share/man/man1/login.1
+usr/share/man/man1/newgrp.1
+usr/share/man/man1/sg.1
+usr/share/man/man1/su.1
+usr/share/man/man5/faillog.5
+usr/share/man/man5/login.defs.5
+usr/share/man/man8/faillog.8
+usr/share/man/man8/lastlog.8
+usr/bin/faillog
+usr/bin/lastlog
+usr/bin/newgrp
+bin/login
+bin/su

Deleted: trunk/debian/passwd.files
===================================================================
--- trunk/debian/passwd.files	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/passwd.files	2005-12-16 19:12:44 UTC (rev 716)
@@ -1,77 +0,0 @@
-usr/bin/chage
-usr/bin/chfn
-usr/bin/chsh
-usr/bin/expiry
-usr/bin/gpasswd
-usr/bin/passwd
-usr/sbin/chpasswd
-usr/sbin/cppw
-usr/sbin/groupadd
-usr/sbin/groupdel
-usr/sbin/groupmod
-usr/sbin/grpck
-usr/sbin/grpconv
-usr/sbin/grpunconv
-usr/sbin/newusers
-usr/sbin/pwck
-usr/sbin/pwconv
-usr/sbin/pwunconv
-usr/sbin/useradd
-usr/sbin/userdel
-usr/sbin/usermod
-usr/sbin/vipw
-usr/share/man/*/man1/chage.1
-usr/share/man/*/man1/chfn.1
-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/login.access.5
-usr/share/man/*/man5/passwd.5
-usr/share/man/*/man5/porttime.5
-usr/share/man/*/man5/shadow.5
-usr/share/man/*/man5/gshadow.5
-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/grpck.8
-usr/share/man/*/man8/grpconv.8
-usr/share/man/*/man8/grpunconv.8
-usr/share/man/*/man8/newusers.8
-usr/share/man/*/man8/pwck.8
-usr/share/man/*/man8/pwconv.8
-usr/share/man/*/man8/pwunconv.8
-usr/share/man/*/man8/useradd.8
-usr/share/man/*/man8/userdel.8
-usr/share/man/*/man8/usermod.8
-usr/share/man/*/man8/vigr.8
-usr/share/man/*/man8/vipw.8
-usr/share/man/man1/chage.1
-usr/share/man/man1/chfn.1
-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/limits.5
-usr/share/man/man5/login.access.5
-usr/share/man/man5/passwd.5
-usr/share/man/man5/porttime.5
-usr/share/man/man5/shadow.5
-usr/share/man/man5/gshadow.5
-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/grpck.8
-usr/share/man/man8/grpconv.8
-usr/share/man/man8/grpunconv.8
-usr/share/man/man8/newusers.8
-usr/share/man/man8/pwck.8
-usr/share/man/man8/pwconv.8
-usr/share/man/man8/pwunconv.8
-usr/share/man/man8/useradd.8
-usr/share/man/man8/userdel.8
-usr/share/man/man8/usermod.8
-usr/share/man/man8/vigr.8
-usr/share/man/man8/vipw.8

Added: trunk/debian/passwd.install
===================================================================
--- trunk/debian/passwd.install	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/passwd.install	2005-12-16 19:12:44 UTC (rev 716)
@@ -0,0 +1,77 @@
+usr/bin/chage
+usr/bin/chfn
+usr/bin/chsh
+usr/bin/expiry
+usr/bin/gpasswd
+usr/bin/passwd
+usr/sbin/chpasswd
+usr/sbin/cppw
+usr/sbin/groupadd
+usr/sbin/groupdel
+usr/sbin/groupmod
+usr/sbin/grpck
+usr/sbin/grpconv
+usr/sbin/grpunconv
+usr/sbin/newusers
+usr/sbin/pwck
+usr/sbin/pwconv
+usr/sbin/pwunconv
+usr/sbin/useradd
+usr/sbin/userdel
+usr/sbin/usermod
+usr/sbin/vipw
+usr/share/man/*/man1/chage.1
+usr/share/man/*/man1/chfn.1
+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/login.access.5
+usr/share/man/*/man5/passwd.5
+usr/share/man/*/man5/porttime.5
+usr/share/man/*/man5/shadow.5
+usr/share/man/*/man5/gshadow.5
+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/grpck.8
+usr/share/man/*/man8/grpconv.8
+usr/share/man/*/man8/grpunconv.8
+usr/share/man/*/man8/newusers.8
+usr/share/man/*/man8/pwck.8
+usr/share/man/*/man8/pwconv.8
+usr/share/man/*/man8/pwunconv.8
+usr/share/man/*/man8/useradd.8
+usr/share/man/*/man8/userdel.8
+usr/share/man/*/man8/usermod.8
+usr/share/man/*/man8/vigr.8
+usr/share/man/*/man8/vipw.8
+usr/share/man/man1/chage.1
+usr/share/man/man1/chfn.1
+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/limits.5
+usr/share/man/man5/login.access.5
+usr/share/man/man5/passwd.5
+usr/share/man/man5/porttime.5
+usr/share/man/man5/shadow.5
+usr/share/man/man5/gshadow.5
+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/grpck.8
+usr/share/man/man8/grpconv.8
+usr/share/man/man8/grpunconv.8
+usr/share/man/man8/newusers.8
+usr/share/man/man8/pwck.8
+usr/share/man/man8/pwconv.8
+usr/share/man/man8/pwunconv.8
+usr/share/man/man8/useradd.8
+usr/share/man/man8/userdel.8
+usr/share/man/man8/usermod.8
+usr/share/man/man8/vigr.8
+usr/share/man/man8/vipw.8

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-12-16 10:39:00 UTC (rev 715)
+++ trunk/debian/rules	2005-12-16 19:12:44 UTC (rev 716)
@@ -31,8 +31,6 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-export DH_COMPAT=3
-
 # The autotools target adds forced build-time dependencies on
 # autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch)
 # It's also a .PHONY make target.
@@ -91,7 +89,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles -Xlogin.defs
+	dh_install -Xlogin.defs --sourcedir debian/tmp
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	dh_install -p passwd --sourcedir debian/tmp/ --autodest \
 	    usr/share/man{/*,}/man5/login.defs.5