[Pkg-sysvinit-commits] r565 - sysvinit/trunk/debian

Thomas Hood jdthood-guest at costa.debian.org
Tue Jan 10 12:47:09 UTC 2006 

Author: jdthood-guest
Date: 2006-01-10 12:47:08 +0000 (Tue, 10 Jan 2006)
New Revision: 565

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/rules
Log:
Clean up install commands in debian/rules

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-10 12:34:59 UTC (rev 564)
+++ sysvinit/trunk/debian/changelog	2006-01-10 12:47:08 UTC (rev 565)
@@ -5,8 +5,10 @@
   * bootclean: Adapt from old bootclean.sh; handle return status more
     carefully; print diagnostic messages on failures; eliminate use
     if subshells; add comments
-  * debian/rules: Use ':', not the deprecated '.' between owner and group
-    names in chown commands
+  * debian/rules:
+    + Use ':', not the deprecated '.' between owner and group names
+      in chown commands
+    + Use '-o root' with install
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Mon,  9 Jan 2006 14:16:02 +0100
 

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2006-01-10 12:34:59 UTC (rev 564)
+++ sysvinit/trunk/debian/rules	2006-01-10 12:47:08 UTC (rev 565)
@@ -44,36 +44,36 @@
 	# sysvinit package
 	#
 	-rm -rf $(tmp)
-	install -d -g root -m 755 -o root $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc}
-	install -d -g root -m 755 -o root $(tmp)/usr/share/sysvinit
-	install -d -g root -m 755 -o root $(tmp)/usr/include
-	install -d -g root -m 755 -o root $(tmp)$(doc)/sysvinit
-	install -g root -m 644 doc/Changelog $(tmp)$(doc)/sysvinit/changelog
-	install -g root -m 644 debian/changelog \
+	install -d -o root -g root -m 755 $(tmp)
+	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,etc}
+	install -d -o root -g root -m 755 $(tmp)/usr/share/sysvinit
+	install -d -o root -g root -m 755 $(tmp)/usr/include
+	install -d -o root -g root -m 755 $(tmp)$(doc)/sysvinit
+	install -o root -g root -m 644 doc/Changelog $(tmp)$(doc)/sysvinit/changelog
+	install -o root -g root -m 644 debian/changelog \
 		$(tmp)$(doc)/sysvinit/changelog.Debian
 	gzip -9f $(tmp)$(doc)/sysvinit/changelog*
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
-		install -g root -m 644 -o root \
+		install -o root -g root -m 644 \
 			debian/share/inittab.$(DEB_HOST_GNU_TYPE) \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	elif test -e debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) ; \
 	then \
-		install -g root -m 644 -o root \
+		install -o root -g root -m 644 \
 			debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	else \
-		install -g root -m 644 -o root debian/share/inittab \
+		install -o root -g root -m 644 debian/share/inittab \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	fi
-	install -g root -m 755 -o root debian/share/update-rc.d \
+	install -o root -g root -m 755 debian/share/update-rc.d \
 		$(tmp)/usr/share/sysvinit
-	install -d -g root -m 755 -o root $(tmp)/{bin,sbin,lib,usr}
-	install -d -g root -m 755 -o root $(tmp)/usr/bin
-	install -d -g root -m 755 -o root $(tmp)/usr/sbin
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man{1,5,8}
+	install -d -o root -g root -m 755 $(tmp)/{bin,sbin,lib,usr}
+	install -d -o root -g root -m 755 $(tmp)/usr/bin
+	install -d -o root -g root -m 755 $(tmp)/usr/sbin
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man{1,5,8}
 	(cd src; make ROOT=$(tmp) DISTRO=Debian install )
 	make -C debian/startpar DESTDIR=$(tmp) install
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
@@ -86,10 +86,10 @@
 	rm -f $(tmp)/usr/share/man/man1/mountpoint.1
 	rm -f $(tmp)/bin/mountpoint
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-	install -g root -m 644 -o root debian/copyright \
+	install -o root -g root -m 644 debian/copyright \
 	  $(tmp)$(doc)/sysvinit/copyright
 	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
-	install -g root -m 755 debian/postinst $(tmp)/DEBIAN/postinst
+	install -o root -g root -m 755 debian/postinst $(tmp)/DEBIAN/postinst
 	dpkg-shlibdeps src/init debian/startpar/startpar
 	dpkg-gencontrol -psysvinit -P$(tmp) -isp
 	dpkg --build $(tmp) ..
@@ -98,17 +98,17 @@
 	# initscripts package
 	#
 	-rm -rf $(tmp)
-	install -d -g root -m 755 -o root $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,sbin,lib,etc}
+	install -d -o root -g root -m 755 $(tmp)
+	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,sbin,lib,etc}
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	install -d -g root -m 755 -o root $(tmp)/sys
+	install -d -o root -g root -m 755 $(tmp)/sys
 endif
-	install -d -g root -m 755 -o root $(tmp)/lib/init
-	install -d -g root -m 755 -o root $(tmp)/usr/share/initscripts
-	install -d -g root -m 755 -o root $(tmp)/var/lib/initscripts
-	install -d -g root -m 755 -o root $(tmp)/var/log/fsck
-	install -d -g root -m 755 -o root $(tmp)$(doc)/initscripts
-	install -g root -m 644 debian/initscripts/doc/* $(tmp)$(doc)/initscripts
+	install -d -o root -g root -m 755 $(tmp)/lib/init
+	install -d -o root -g root -m 755 $(tmp)/usr/share/initscripts
+	install -d -o root -g root -m 755 $(tmp)/var/lib/initscripts
+	install -d -o root -g root -m 755 $(tmp)/var/log/fsck
+	install -d -o root -g root -m 755 $(tmp)$(doc)/initscripts
+	install -o root -g root -m 644 debian/initscripts/doc/* $(tmp)$(doc)/initscripts
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
 		> $(tmp)$(doc)/initscripts/changelog.Debian
 	chmod 644 $(tmp)$(doc)/initscripts/changelog.Debian
@@ -120,34 +120,34 @@
 	chmod 644 $(tmp)/lib/init/*.sh
 	chmod -R g-w $(tmp)
 	chown -R root:root $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/bin
-	install -d -g root -m 755 -o root $(tmp)/etc/default
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man1
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man5
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man8
-	install -d -g root -m 755 -o root $(tmp)/var/lib/urandom
-	install -g root -m 755 debian/initscripts/sbin/fsck.nfs \
+	install -d -o root -g root -m 755 $(tmp)/bin
+	install -d -o root -g root -m 755 $(tmp)/etc/default
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man1
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man5
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
+	install -d -o root -g root -m 755 $(tmp)/var/lib/urandom
+	install -o root -g root -m 755 debian/initscripts/sbin/fsck.nfs \
 		$(tmp)/sbin/fsck.nfs
-	install -g root -m 644 debian/initscripts/man/fsck.nfs.8 \
+	install -o root -g root -m 644 debian/initscripts/man/fsck.nfs.8 \
 		$(tmp)/usr/share/man/man8/fsck.nfs.8
-	install -g root -m 644 debian/initscripts/rcS.5 \
+	install -o root -g root -m 644 debian/initscripts/rcS.5 \
 		$(tmp)/usr/share/man/man5
-	install -g root -m 755 src/mountpoint $(tmp)/bin
+	install -o root -g root -m 755 src/mountpoint $(tmp)/bin
 	strip -s -R .comment $(tmp)/bin/mountpoint
-	install -g root -m 644 man/mountpoint.1 $(tmp)/usr/share/man/man1
-	install -g root -m 755 debian/readlink $(tmp)/lib/init
+	install -o root -g root -m 644 man/mountpoint.1 $(tmp)/usr/share/man/man1
+	install -o root -g root -m 755 debian/readlink $(tmp)/lib/init
 	strip -s -R .comment $(tmp)/lib/init/readlink
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-	install -d -g root -m 755 -o root $(tmp)/usr/share/lintian/overrides
-	install -g root -m 644 -o root \
+	install -d -o root -g root -m 755 $(tmp)/usr/share/lintian/overrides
+	install -o root -g root -m 644 \
 		debian/initscripts/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/initscripts
-	install -g root -m 644 -o root debian/initscripts/copyright \
+	install -o root -g root -m 644 debian/initscripts/copyright \
 	  $(tmp)$(doc)/initscripts/copyright
-	install -g root -m 755 debian/initscripts/preinst  $(tmp)/DEBIAN
-	install -g root -m 755 debian/initscripts/postinst $(tmp)/DEBIAN
-	install -g root -m 755 debian/initscripts/postrm $(tmp)/DEBIAN
-	install -g root -m 644 -o root debian/initscripts/conffiles \
+	install -o root -g root -m 755 debian/initscripts/preinst  $(tmp)/DEBIAN
+	install -o root -g root -m 755 debian/initscripts/postinst $(tmp)/DEBIAN
+	install -o root -g root -m 755 debian/initscripts/postrm $(tmp)/DEBIAN
+	install -o root -g root -m 644 debian/initscripts/conffiles \
 	  $(tmp)/DEBIAN/conffiles
 	dpkg-shlibdeps debian/readlink
 	sh debian/deps-mount >> debian/substvars
@@ -163,50 +163,50 @@
 	# sysv-rc package
 	#
 	-rm -rf $(tmp)
-	install -d -g root -m 755 -o root $(tmp)/{DEBIAN,etc}
-	install -d -g root -m 755 -o root $(tmp)/usr/share
-	install -d -g root -m 755 -o root $(tmp)$(doc)/sysv-rc
-	install -g root -m 644 debian/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
+	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,etc}
+	install -d -o root -g root -m 755 $(tmp)/usr/share
+	install -d -o root -g root -m 755 $(tmp)$(doc)/sysv-rc
+	install -o root -g root -m 644 debian/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
 		> $(tmp)$(doc)/sysv-rc/changelog.Debian
 	chmod 644 $(tmp)$(doc)/sysv-rc/changelog.Debian
 	gzip -9f $(tmp)$(doc)/sysv-rc/*
-	install -d -g root -m 755 -o root $(tmp)/etc/rc{2,3,4,5}.d
+	install -d -o root -g root -m 755 $(tmp)/etc/rc{2,3,4,5}.d
 	cp -af debian/sysv-rc/etc/* $(tmp)/etc
 	for N in 2 3 4 5 ; do \
-		install -g root -m 644 -o root debian/sysv-rc/rc2-5.d-README \
+		install -o root -g root -m 644 debian/sysv-rc/rc2-5.d-README \
 			$(tmp)/etc/rc$${N}.d/README ; \
 	done
 	chmod 755 $(tmp)/etc/init.d/[a-z]*
 	chmod 644 $(tmp)/etc/init.d/README
 	chmod -R go=u-w $(tmp)/etc
 	chown -R root:root $(tmp)/etc
-	install -d -g root -m 755 -o root $(tmp)/usr/sbin
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man5
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/man8
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/ja/man8
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/fr/man8
-	install -d -g root -m 755 -o root $(tmp)/usr/share/man/es/man8
-	install -g root -m 644 debian/sysv-rc/man8/*.8 \
+	install -d -o root -g root -m 755 $(tmp)/usr/sbin
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man5
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/ja/man8
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/fr/man8
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/es/man8
+	install -o root -g root -m 644 debian/sysv-rc/man8/*.8 \
 		$(tmp)/usr/share/man/man8
-	install -g root -m 644 debian/sysv-rc/man8/ja/*.8 \
+	install -o root -g root -m 644 debian/sysv-rc/man8/ja/*.8 \
 		$(tmp)/usr/share/man/ja/man8
-	install -g root -m 644 debian/sysv-rc/man8/fr/*.8 \
+	install -o root -g root -m 644 debian/sysv-rc/man8/fr/*.8 \
 		$(tmp)/usr/share/man/fr/man8
-	install -g root -m 644 debian/sysv-rc/man8/es/*.8 \
+	install -o root -g root -m 644 debian/sysv-rc/man8/es/*.8 \
 		$(tmp)/usr/share/man/es/man8
-	install -g root -m 755 debian/sysv-rc/sbin/invoke-rc.d $(tmp)/usr/sbin
-	install -g root -m 755 debian/sysv-rc/sbin/update-rc.d $(tmp)/usr/sbin
+	install -o root -g root -m 755 debian/sysv-rc/sbin/invoke-rc.d $(tmp)/usr/sbin
+	install -o root -g root -m 755 debian/sysv-rc/sbin/update-rc.d $(tmp)/usr/sbin
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9] \
 		 $(tmp)/usr/share/man/??/man*/*.[0-9]
-	install -d -g root -m 755 -o root $(tmp)/usr/share/lintian/overrides
-	install -g root -m 644 -o root \
+	install -d -o root -g root -m 755 $(tmp)/usr/share/lintian/overrides
+	install -o root -g root -m 644 \
 		debian/sysv-rc/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/sysv-rc
-	install -g root -m 644 -o root debian/sysv-rc/copyright \
+	install -o root -g root -m 644 debian/sysv-rc/copyright \
 	  $(tmp)$(doc)/sysv-rc/copyright
-	install -g root -m 755 debian/sysv-rc/postinst $(tmp)/DEBIAN/postinst
-	install -g root -m 755 debian/sysv-rc/postrm $(tmp)/DEBIAN/postrm
+	install -o root -g root -m 755 debian/sysv-rc/postinst $(tmp)/DEBIAN/postinst
+	install -o root -g root -m 755 debian/sysv-rc/postrm $(tmp)/DEBIAN/postrm
 	dpkg-gencontrol -psysv-rc -P$(tmp) -isp
 	dpkg --build $(tmp) ..
 	rm -rf $(tmp)

More information about the Pkg-sysvinit-commits mailing list