[Pkg-sysvinit-commits] r1738 - in sysvinit/trunk/debian: . src/sysv-rc

Petter Reinholdtsen pere at alioth.debian.org
Mon Sep 7 19:30:43 UTC 2009 

Author: pere
Date: 2009-09-07 19:30:43 +0000 (Mon, 07 Sep 2009)
New Revision: 1738

Modified:
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/rules
   sysvinit/trunk/debian/src/sysv-rc/Makefile
Log:
Continue conversion to debhelper.

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2009-09-07 17:57:03 UTC (rev 1737)
+++ sysvinit/trunk/debian/control	2009-09-07 19:30:43 UTC (rev 1738)
@@ -13,7 +13,7 @@
 Essential: yes
 Architecture: any
 Pre-Depends: initscripts, sysv-rc | file-rc, sysvinit-utils (>= 2.86.ds1-66)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: System-V-like init utilities
  This package contains programs required for booting
  a Debian system and doing basic process management.
@@ -28,7 +28,7 @@
 Architecture: any
 Conflicts: last, sysvconfig, chkconfig (<< 11.0-79.1-2)
 Replaces: last, sysvinit (<= 2.86.ds1-65)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: sash
 Description: System-V-like utilities
  This package contains the important System-V-like utilities.
@@ -42,7 +42,7 @@
 Conflicts: file-rc
 Replaces: file-rc
 Suggests: sysv-rc-conf, bum
-Depends: debconf | debconf-2.0, sysvinit-utils (>= 2.86.ds1-62), insserv (>> 1.12.0-10)
+Depends: ${misc:Depends}, sysvinit-utils (>= 2.86.ds1-62), insserv (>> 1.12.0-10)
 Breaks: initscripts (<< 2.86.ds1-63)
 Description: System-V-like runlevel change mechanism
  This package provides support for the System-V like system
@@ -51,7 +51,7 @@
 
 Package: initscripts
 Architecture: any
-Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-64), sysv-rc | file-rc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${glibc:Depends}, ${mount:Depends}, debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-64), sysv-rc | file-rc
 Recommends: psmisc, e2fsprogs
 Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1)
 Replaces: libc6, libc6.1, libc0.1, libc0.3

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-07 17:57:03 UTC (rev 1737)
+++ sysvinit/trunk/debian/rules	2009-09-07 19:30:43 UTC (rev 1738)
@@ -8,6 +8,7 @@
 rctmp   = $(shell pwd)/debian/sysv-rc
 inittmp = $(shell pwd)/debian/initscripts
 doc	= /usr/share/doc
+overridedir = /usr/share/lintian/overrides
 
 LC_ALL	= POSIX
 
@@ -72,13 +73,6 @@
 	# sysvinit package
 	#
 	dh_installdirs -psysvinit
-	$(INSTALL) -d $(tmp)/DEBIAN
-	$(INSTALL_DATA) doc/Changelog \
-		$(tmp)$(doc)/sysvinit/changelog
-	$(INSTALL_DATA) debian/changelog \
-		$(tmp)$(doc)/sysvinit/changelog.Debian
-	$(INSTALL_DATA) debian/NEWS \
-		$(tmp)$(doc)/sysvinit/NEWS.Debian
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
 		$(INSTALL_DATA) \
@@ -127,28 +121,19 @@
 	rmdir $(tmp)/usr/sbin
 	rmdir $(tmp)/usr/bin
 	rmdir $(tmp)/bin
-	$(INSTALL) -d $(tmp)/usr/share/lintian/overrides
-	$(INSTALL_DATA) \
-		debian/sysvinit.lintian.overrides \
-		$(tmp)/usr/share/lintian/overrides/sysvinit
+	$(INSTALL) -d $(tmp)$(overridedir)
+	$(INSTALL_DATA) debian/sysvinit.lintian.overrides \
+		$(tmp)$(overridedir)/sysvinit
 	$(INSTALL_DATA) debian/copyright \
-	  $(tmp)$(doc)/sysvinit/copyright
+		$(tmp)$(doc)/sysvinit/copyright
 	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
-	$(INSTALL) debian/postinst $(tmp)/DEBIAN/postinst
-	dh_compress -psysvinit
+	dh_installchangelogs -psysvinit doc/Changelog
+	dh_installdeb -psysvinit
 	dh_shlibdeps -psysvinit $(tmp)/sbin/init
-	dh_gencontrol -psysvinit
-	dh_md5sums -psysvinit
-	dh_builddeb -psysvinit
 	#
 	# sysvinit-utils package
 	#
 	dh_installdirs -psysvinit-utils
-	$(INSTALL) -d $(utiltmp)/DEBIAN
-	$(INSTALL_DATA) doc/Changelog \
-		$(utiltmp)$(doc)/sysvinit-utils/changelog
-	$(INSTALL_DATA) debian/changelog \
-		$(utiltmp)$(doc)/sysvinit-utils/changelog.Debian
 	$(INSTALL) src/killall5 $(utiltmp)/sbin
 	$(INSTALL) src/sulogin $(utiltmp)/sbin
 	$(INSTALL) src/fstab-decode $(utiltmp)/sbin
@@ -169,14 +154,12 @@
 	$(INSTALL_DATA) man/pidof.8 $(utiltmp)/usr/share/man/man8
 	$(INSTALL_DATA) man/fstab-decode.8 $(utiltmp)/usr/share/man/man8
 	$(INSTALL_DATA) debian/copyright \
-	  $(utiltmp)$(doc)/sysvinit-utils/copyright
+		$(utiltmp)$(doc)/sysvinit-utils/copyright
 	cat COPYRIGHT >> $(utiltmp)$(doc)/sysvinit-utils/copyright
-	dh_strip -psysvinit-utils
-	dh_compress -psysvinit-utils
+	dh_installchangelogs -psysvinit-utils doc/Changelog
+	# Only want the NEWS file in the sysvinit package
+	$(RM) $(utiltmp)$(doc)/sysvinit-utils/NEWS.Debian
 	dh_shlibdeps -psysvinit-utils $(utiltmp)/sbin//init debian/$(utiltmp)/sbin/startpar
-	dh_gencontrol -psysvinit-utils
-	dh_md5sums -psysvinit-utils
-	dh_builddeb -psysvinit-utils
 	#
 	# initscripts package
 	#
@@ -186,60 +169,62 @@
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 	$(INSTALL) -d $(inittmp)/sys
 endif
-	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(inittmp)$(doc)/initscripts/changelog.Debian
 	$(INSTALL) src/mountpoint $(inittmp)/bin
 	$(INSTALL_DATA) man/mountpoint.1 $(inittmp)/usr/share/man/man1
 	$(INSTALL) debian/readlink $(inittmp)/lib/init
-	$(INSTALL) -d $(inittmp)/usr/share/lintian/overrides
-	$(INSTALL_DATA) \
-		debian/initscripts.lintian.overrides \
-		$(inittmp)/usr/share/lintian/overrides/initscripts
-	$(INSTALL_DATA) debian/initscripts.copyright \
-	  $(inittmp)$(doc)/initscripts/copyright
-	$(INSTALL) -d $(inittmp)/DEBIAN
-	$(INSTALL) debian/initscripts.preinst  $(inittmp)/DEBIAN/preinst
-	$(INSTALL) debian/initscripts.postinst $(inittmp)/DEBIAN/postinst
-	$(INSTALL) debian/initscripts.postrm $(inittmp)/DEBIAN/postrm
+	$(INSTALL) -d $(inittmp)$(overridedir)
+	$(INSTALL_DATA) debian/initscripts.lintian.overrides \
+		$(inittmp)$(overridedir)/initscripts
+	dh_installdocs -pinitscripts
+	dh_installchangelogs -pinitscripts
+	sed -i -ne '/sysvinit (2.84-3)/q' -e p \
+		$(inittmp)$(doc)/initscripts/changelog.Debian
+	# Only want the NEWS file in the sysvinit package
+	$(RM) $(inittmp)$(doc)/initscripts/NEWS.Debian
+	dh_installdeb -pinitscripts
+	# Override autogenerated conffiles
 	$(INSTALL_DATA) debian/initscripts.conffiles \
-	  $(inittmp)/DEBIAN/conffiles
+		$(inittmp)/DEBIAN/conffiles
 	sh debian/deps-mount >> debian/initscripts.substvars
 	sh debian/deps-glibc >> debian/initscripts.substvars
 	dh_fixperms -pinitscripts -X/etc/init.d/skeleton
-	dh_strip -pinitscripts
-	dh_compress -pinitscripts
 	dh_shlibdeps -pinitscripts $(inittmp)/lib/init/readlink
-	dh_gencontrol -pinitscripts
-	dh_md5sums -pinitscripts
-	dh_builddeb -pinitscripts
 
+	# Wrap it all up
+	dh_strip -a
+	dh_compress -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
 # Architecture independant files.
-binary-indep: build
+binary-indep:
 	#
 	# sysv-rc package
 	#
+	dh_testroot
 	$(MAKE) -C debian/src/sysv-rc install DESTDIR=$(rctmp)
-	$(INSTALL) -d $(rctmp)/var/lib/insserv
-	$(INSTALL) -d $(rctmp)/var/lib/update-rc.d
-	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(rctmp)$(doc)/sysv-rc/changelog.Debian
-	chmod 644 $(rctmp)$(doc)/sysv-rc/changelog.Debian
-	$(INSTALL) -d $(rctmp)/usr/share/lintian/overrides
-	$(INSTALL_DATA) \
-		debian/sysv-rc.lintian.overrides \
-		$(rctmp)/usr/share/lintian/overrides/sysv-rc
-	$(INSTALL_DATA) debian/sysv-rc.copyright \
-	  $(rctmp)$(doc)/sysv-rc/copyright
-	$(INSTALL) -d $(rctmp)/DEBIAN
-	po2debconf debian/sysv-rc.templates > $(rctmp)/DEBIAN/templates
-	for f in preinst postinst prerm postrm ; do \
-		$(INSTALL) debian/sysv-rc.$$f $(rctmp)/DEBIAN/$$f ; \
-	done
-	dh_compress -psysv-rc
-	dh_gencontrol -psysv-rc
-	dh_md5sums -psysv-rc
-	dh_builddeb -psysv-rc
+	$(INSTALL) -d $(rctmp)$(overridedir)
+	$(INSTALL_DATA) debian/sysv-rc.lintian.overrides \
+		$(rctmp)$(overridedir)/sysv-rc
+	dh_installdocs -psysv-rc
+	dh_installchangelogs -psysv-rc
+	sed -i -ne '/sysvinit (2.84-3)/q' -e p \
+		$(rctmp)$(doc)/sysv-rc/changelog.Debian
+	# Only want the NEWS file in the sysvinit package
+	$(RM) $(rctmp)$(doc)/sysv-rc/NEWS.Debian
+	dh_installdebconf -psysv-rc
+	dh_installdeb -psysv-rc
+	# Neither rc, rcS nor README are conffiles
+	$(RM) $(rctmp)/DEBIAN/conffiles
+	dh_fixperms -psysv-rc -X/etc/init.d/README
 
+	# Wrap it all up
+	dh_compress -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
 clean:
 	dh_testdir
 	$(MAKE) -C src clobber

Modified: sysvinit/trunk/debian/src/sysv-rc/Makefile
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/Makefile	2009-09-07 17:57:03 UTC (rev 1737)
+++ sysvinit/trunk/debian/src/sysv-rc/Makefile	2009-09-07 19:30:43 UTC (rev 1738)
@@ -12,6 +12,8 @@
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(docdir)/.
+	$(INSTALL) -d $(DESTDIR)/var/lib/insserv
+	$(INSTALL) -d $(DESTDIR)/var/lib/update-rc.d
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
 	$(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)/.
 	cp -af etc/* $(DESTDIR)$(sysconfdir)

More information about the Pkg-sysvinit-commits mailing list