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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-09 21:42:15 +0000 (Wed, 09 Sep 2009)
New Revision: 1749

Added:
   sysvinit/trunk/debian/sysvinit-utils.manpages
Modified:
   sysvinit/trunk/debian/initscripts.install
   sysvinit/trunk/debian/rules
   sysvinit/trunk/debian/sysvinit-utils.install
   sysvinit/trunk/debian/sysvinit.install
Log:
Use dh_install and dh_installman to install more files.  Patch from Michael Biebl.

Modified: sysvinit/trunk/debian/initscripts.install
===================================================================
--- sysvinit/trunk/debian/initscripts.install	2009-09-09 21:36:44 UTC (rev 1748)
+++ sysvinit/trunk/debian/initscripts.install	2009-09-09 21:42:15 UTC (rev 1749)
@@ -1,2 +1,3 @@
 bin/mountpoint
 usr/share/man/man1/mountpoint.1
+debian/readlink lib/init/

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-09 21:36:44 UTC (rev 1748)
+++ sysvinit/trunk/debian/rules	2009-09-09 21:42:15 UTC (rev 1749)
@@ -90,8 +90,6 @@
 		$(INSTALL_DATA) debian/share/inittab \
 			$(sysvtmp)/usr/share/sysvinit/inittab ; \
 	fi
-	$(INSTALL) debian/share/update-rc.d \
-		$(sysvtmp)/usr/share/sysvinit
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
 	# The Hurd has its own halt and reboot commands.
 	rm -f $(sysvtmp)/usr/share/man/man8/halt.8
@@ -109,8 +107,6 @@
 	# sysvinit-utils package
 	#
 	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(utiltmp) install
-	$(INSTALL) debian/service/service $(utiltmp)/usr/sbin
-	$(INSTALL_DATA) debian/service/service.8 $(utiltmp)/usr/share/man/man8
 	$(INSTALL_DATA) debian/copyright \
 		$(utiltmp)$(doc)/sysvinit-utils/copyright
 	cat COPYRIGHT >> $(utiltmp)$(doc)/sysvinit-utils/copyright
@@ -123,7 +119,6 @@
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 	$(INSTALL) -d $(inittmp)/sys
 endif
-	$(INSTALL) debian/readlink $(inittmp)/lib/init
 	dh_installdocs -pinitscripts
 	dh_installchangelogs -pinitscripts
 	sed -i -ne '/sysvinit (2.84-3)/q' -e p \
@@ -138,6 +133,7 @@
 	dh_shlibdeps -pinitscripts $(inittmp)/lib/init/readlink
 
 	# Wrap it all up
+	dh_installman -a
 	dh_lintian -a
 	dh_strip -a
 	dh_compress -a
@@ -163,6 +159,7 @@
 	dh_fixperms -psysv-rc -X/etc/init.d/README
 
 	# Wrap it all up
+	dh_installman -i
 	dh_lintian -i
 	dh_compress -i
 	dh_gencontrol -i

Modified: sysvinit/trunk/debian/sysvinit-utils.install
===================================================================
--- sysvinit/trunk/debian/sysvinit-utils.install	2009-09-09 21:36:44 UTC (rev 1748)
+++ sysvinit/trunk/debian/sysvinit-utils.install	2009-09-09 21:42:15 UTC (rev 1749)
@@ -12,3 +12,4 @@
 usr/share/man/man8/killall5.8
 usr/share/man/man8/pidof.8
 usr/share/man/man8/sulogin.8
+debian/service/service usr/sbin/

Added: sysvinit/trunk/debian/sysvinit-utils.manpages
===================================================================
--- sysvinit/trunk/debian/sysvinit-utils.manpages	                        (rev 0)
+++ sysvinit/trunk/debian/sysvinit-utils.manpages	2009-09-09 21:42:15 UTC (rev 1749)
@@ -0,0 +1 @@
+debian/service/service.8

Modified: sysvinit/trunk/debian/sysvinit.install
===================================================================
--- sysvinit/trunk/debian/sysvinit.install	2009-09-09 21:36:44 UTC (rev 1748)
+++ sysvinit/trunk/debian/sysvinit.install	2009-09-09 21:42:15 UTC (rev 1749)
@@ -12,3 +12,4 @@
 usr/share/man/man5/initscript.5
 usr/share/man/man5/inittab.5
 usr/include/initreq.h
+debian/share/update-rc.d usr/share/sysvinit/