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

Petter Reinholdtsen pere at alioth.debian.org
Mon Sep 7 16:52:10 UTC 2009


Author: pere
Date: 2009-09-07 16:52:08 +0000 (Mon, 07 Sep 2009)
New Revision: 1735

Added:
   sysvinit/trunk/debian/initscripts.dirs
   sysvinit/trunk/debian/sysvinit-utils.dirs
   sysvinit/trunk/debian/sysvinit.dirs
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/compat
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/rules
   sysvinit/trunk/debian/src/initscripts/Makefile
   sysvinit/trunk/debian/src/sysv-rc/Makefile
Log:
Restructure build rules to use debhelper more, and migrate to debhelper 7.


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/changelog	2009-09-07 16:52:08 UTC (rev 1735)
@@ -11,9 +11,8 @@
     that bootlogd disappear during partial upgrades (Closes: #545368).
   * Restructure source package to make it possible to use debhelper in
     the common way to build the source, by moving debian/initscripts/
-    and debian/sysv-rc/ into debian/src/.   Add Makefile to each
-    directory to install the files in those directories and use it from
-    the rules file.
+    and debian/sysv-rc/ into debian/src/.  Restructure build rules to
+    use debhelper more, and migrate to debhelper 7.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 06 Sep 2009 17:13:33 +0200
 

Modified: sysvinit/trunk/debian/compat
===================================================================
--- sysvinit/trunk/debian/compat	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/compat	2009-09-07 16:52:08 UTC (rev 1735)
@@ -1 +1 @@
-1
+7

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/control	2009-09-07 16:52:08 UTC (rev 1735)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: Debian sysvinit maintainers <pkg-sysvinit-devel at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Henrique de Moraes Holschuh <hmh at debian.org>, Kel Modderman <kel at otaku42.de>
-Build-Depends: debhelper (>= 1), po-debconf, quilt (>= 0.40), libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libsepol1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.40), libselinux1-dev (>= 1.14) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libsepol1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 Standards-Version: 3.8.3
 Homepage: http://freshmeat.net/projects/sysvinit/
 Vcs-Svn: svn://svn.debian.org/pkg-sysvinit/sysvinit/trunk

Added: sysvinit/trunk/debian/initscripts.dirs
===================================================================
--- sysvinit/trunk/debian/initscripts.dirs	                        (rev 0)
+++ sysvinit/trunk/debian/initscripts.dirs	2009-09-07 16:52:08 UTC (rev 1735)
@@ -0,0 +1,2 @@
+bin
+usr/share/man/man1

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/rules	2009-09-07 16:52:08 UTC (rev 1735)
@@ -3,7 +3,10 @@
 #	debian/rules file for sysvinit
 #
 
-tmp     = $(shell pwd)/debian/tmp
+tmp     = $(shell pwd)/debian/sysvinit
+utiltmp = $(shell pwd)/debian/sysvinit-utils
+rctmp   = $(shell pwd)/debian/sysv-rc
+inittmp = $(shell pwd)/debian/initscripts
 doc	= /usr/share/doc
 
 LC_ALL	= POSIX
@@ -13,6 +16,9 @@
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true)
 
+INSTALL_DATA = install -o root -g root -m 644
+INSTALL      = install -o root -g root -m 755
+
 # Handle cross builds
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
@@ -65,46 +71,30 @@
 	#
 	# sysvinit package
 	#
-	-rm -rf $(tmp)
-	install -d -o root -g root -m 755 $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/DEBIAN
-	install -d -o root -g root -m 755 $(tmp)/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 \
+	dh_installdirs -psysvinit
+	$(INSTALL) -d $(tmp)/DEBIAN
+	$(INSTALL_DATA) doc/Changelog \
 		$(tmp)$(doc)/sysvinit/changelog
-	install -o root -g root -m 644 debian/changelog \
+	$(INSTALL_DATA) debian/changelog \
 		$(tmp)$(doc)/sysvinit/changelog.Debian
-	install -o root -g root -m 644 debian/NEWS \
+	$(INSTALL_DATA) debian/NEWS \
 		$(tmp)$(doc)/sysvinit/NEWS.Debian
-	gzip -9f $(tmp)$(doc)/sysvinit/changelog*
-	gzip -9f $(tmp)$(doc)/sysvinit/NEWS.Debian
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
-		install -o root -g root -m 644 \
+		$(INSTALL_DATA) \
 			debian/share/inittab.$(DEB_HOST_GNU_TYPE) \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	elif test -e debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) ; \
 	then \
-		install -o root -g root -m 644 \
+		$(INSTALL_DATA) \
 			debian/share/inittab.$(DEB_HOST_GNU_SYSTEM) \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	else \
-		install -o root -g root -m 644 debian/share/inittab \
+		$(INSTALL_DATA) debian/share/inittab \
 			$(tmp)/usr/share/sysvinit/inittab ; \
 	fi
-	install -o root -g root -m 755 debian/share/update-rc.d \
+	$(INSTALL) debian/share/update-rc.d \
 		$(tmp)/usr/share/sysvinit
-	install -d -o root -g root -m 755 $(tmp)/bin
-	install -d -o root -g root -m 755 $(tmp)/sbin
-	install -d -o root -g root -m 755 $(tmp)/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/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
 	$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
 	# The Hurd has its own halt and reboot commands.
@@ -137,155 +127,127 @@
 	rmdir $(tmp)/usr/sbin
 	rmdir $(tmp)/usr/bin
 	rmdir $(tmp)/bin
-	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-	install -d -o root -g root -m 755 $(tmp)/usr/share/lintian/overrides
-	install -o root -g root -m 644 \
+	$(INSTALL) -d $(tmp)/usr/share/lintian/overrides
+	$(INSTALL_DATA) \
 		debian/sysvinit.lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/sysvinit
-	install -o root -g root -m 644 debian/copyright \
+	$(INSTALL_DATA) debian/copyright \
 	  $(tmp)$(doc)/sysvinit/copyright
 	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
-	install -o root -g root -m 755 debian/postinst $(tmp)/DEBIAN/postinst
-	dpkg-shlibdeps src/init
-	dpkg-gencontrol -psysvinit -P$(tmp) -isp
-	dh_md5sums -Ninitscripts -Nsysv-rc
-	dpkg --build $(tmp) ..
-	rm -rf $(tmp)
+	$(INSTALL) debian/postinst $(tmp)/DEBIAN/postinst
+	dh_compress -psysvinit
+	dh_shlibdeps -psysvinit $(tmp)/sbin/init
+	dh_gencontrol -psysvinit
+	dh_md5sums -psysvinit
+	dh_builddeb -psysvinit
 	#
 	# sysvinit-utils package
 	#
-	-rm -rf $(tmp)
-	install -d -o root -g root -m 755 $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/DEBIAN
-	install -d -o root -g root -m 755 $(tmp)$(doc)/sysvinit-utils
-	install -o root -g root -m 644 doc/Changelog \
-		$(tmp)$(doc)/sysvinit-utils/changelog
-	install -o root -g root -m 644 debian/changelog \
-		$(tmp)$(doc)/sysvinit-utils/changelog.Debian
-	gzip -9f $(tmp)$(doc)/sysvinit-utils/changelog*
-	install -d -o root -g root -m 755 $(tmp)/bin
-	install -d -o root -g root -m 755 $(tmp)/sbin
-	install -d -o root -g root -m 755 $(tmp)/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/man1
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 755 src/killall5 $(tmp)/sbin
-	install -o root -g root -m 755 src/sulogin $(tmp)/sbin
-	install -o root -g root -m 755 src/fstab-decode $(tmp)/sbin
-	install -o root -g root -m 755 src/bootlogd $(tmp)/sbin
-	install -o root -g root -m 755 src/last $(tmp)/usr/bin
-	install -o root -g root -m 755 src/mesg $(tmp)/usr/bin
-	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(tmp) install
-	strip -s -R comment -R .comment $(tmp)/sbin/startpar
-	install -o root -g root -m 755 debian/service/service $(tmp)/usr/sbin
-	strip -s -R .comment $(tmp)/sbin/killall5
-	strip -s -R .comment $(tmp)/sbin/sulogin
-	strip -s -R .comment $(tmp)/usr/bin/last
-	strip -s -R .comment $(tmp)/usr/bin/mesg
-	ln -sf /sbin/killall5 $(tmp)/bin/pidof
-	ln -sf last $(tmp)/usr/bin/lastb
-	install -o root -g root -m 644 man/killall5.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/sulogin.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/bootlogd.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/last.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 man/lastb.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 man/mesg.1 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 644 debian/service/service.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/pidof.8 $(tmp)/usr/share/man/man8
-	install -o root -g root -m 644 man/fstab-decode.8 $(tmp)/usr/share/man/man8
-	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-	install -o root -g root -m 644 debian/copyright \
-	  $(tmp)$(doc)/sysvinit-utils/copyright
-	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit-utils/copyright
-	dpkg-shlibdeps src/init debian/startpar/startpar
-	dpkg-gencontrol -psysvinit-utils -P$(tmp) -isp
-	dh_md5sums -Ninitscripts -Nsysv-rc
-	dpkg --build $(tmp) ..
-	rm -rf $(tmp)
+	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
+	$(INSTALL) src/bootlogd $(utiltmp)/sbin
+	$(INSTALL) src/last $(utiltmp)/usr/bin
+	$(INSTALL) src/mesg $(utiltmp)/usr/bin
+	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(utiltmp) install
+	$(INSTALL) debian/service/service $(utiltmp)/usr/sbin
+	ln -sf /sbin/killall5 $(utiltmp)/bin/pidof
+	ln -sf last $(utiltmp)/usr/bin/lastb
+	$(INSTALL_DATA) man/killall5.8 $(utiltmp)/usr/share/man/man8
+	$(INSTALL_DATA) man/sulogin.8 $(utiltmp)/usr/share/man/man8
+	$(INSTALL_DATA) man/bootlogd.8 $(utiltmp)/usr/share/man/man8
+	$(INSTALL_DATA) man/last.1 $(utiltmp)/usr/share/man/man1
+	$(INSTALL_DATA) man/lastb.1 $(utiltmp)/usr/share/man/man1
+	$(INSTALL_DATA) man/mesg.1 $(utiltmp)/usr/share/man/man1
+	$(INSTALL_DATA) debian/service/service.8 $(utiltmp)/usr/share/man/man8
+	$(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
+	cat COPYRIGHT >> $(utiltmp)$(doc)/sysvinit-utils/copyright
+	dh_strip -psysvinit-utils
+	dh_compress -psysvinit-utils
+	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
 	#
-	-rm -rf $(tmp)
-	$(MAKE) -C debian/src/initscripts install DESTDIR=$(tmp)
+	dh_installdirs -pinitscripts
+	$(MAKE) -C debian/src/initscripts install DESTDIR=$(inittmp)
 
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
-	install -d -o root -g root -m 755 $(tmp)/sys
+	$(INSTALL) -d $(inittmp)/sys
 endif
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(tmp)$(doc)/initscripts/changelog.Debian
-	chmod 644 $(tmp)$(doc)/initscripts/changelog.Debian
-	gzip -9f $(tmp)$(doc)/initscripts/*
-	chmod -R g-w $(tmp)
-	chown -R root:root $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/bin
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man1
-	install -o root -g root -m 755 src/mountpoint $(tmp)/bin
-	strip -s -R .comment $(tmp)/bin/mountpoint
-	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 -o root -g root -m 755 $(tmp)/usr/share/lintian/overrides
-	install -o root -g root -m 644 \
+		> $(inittmp)$(doc)/initscripts/changelog.Debian
+	chmod 644 $(inittmp)$(doc)/initscripts/changelog.Debian
+	chmod -R g-w $(inittmp)
+	chown -R root:root $(inittmp)
+	$(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 \
-		$(tmp)/usr/share/lintian/overrides/initscripts
-	install -o root -g root -m 644 debian/initscripts.copyright \
-	  $(tmp)$(doc)/initscripts/copyright
-	install -d -o root -g root -m 755 $(tmp)/DEBIAN
-	install -o root -g root -m 755 debian/initscripts.preinst  $(tmp)/DEBIAN/preinst
-	install -o root -g root -m 755 debian/initscripts.postinst $(tmp)/DEBIAN/postinst
-	install -o root -g root -m 755 debian/initscripts.postrm $(tmp)/DEBIAN/postrm
-	install -o root -g root -m 644 debian/initscripts.conffiles \
-	  $(tmp)/DEBIAN/conffiles
-	dpkg-shlibdeps debian/readlink
-	sh debian/deps-mount >> debian/substvars
-	sh debian/deps-glibc >> debian/substvars
-	dpkg-gencontrol -pinitscripts -P$(tmp) -isp
-	dh_md5sums -Ninitscripts -Nsysv-rc
-	dpkg --build $(tmp) ..
-	rm -rf $(tmp)
+		$(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_DATA) debian/initscripts.conffiles \
+	  $(inittmp)/DEBIAN/conffiles
+	sh debian/deps-mount >> debian/initscripts.substvars
+	sh debian/deps-glibc >> debian/initscripts.substvars
+	dh_strip -pinitscripts
+	dh_compress -pinitscripts
+	dh_shlibdeps -pinitscripts $(inittmp)/lib/init/readlink
+	dh_gencontrol -pinitscripts
+	dh_md5sums -pinitscripts
+	dh_builddeb -pinitscripts
 
 # Architecture independant files.
 binary-indep: build
 	#
 	# sysv-rc package
 	#
-	-rm -rf $(tmp)
-	$(MAKE) -C debian/src/sysv-rc install DESTDIR=$(tmp)
-	install -d -o root -g root -m 755 $(tmp)/var/lib/insserv
-	install -d -o root -g root -m 755 $(tmp)/var/lib/update-rc.d
+	$(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 \
-		> $(tmp)$(doc)/sysv-rc/changelog.Debian
-	chmod 644 $(tmp)$(doc)/sysv-rc/changelog.Debian
-	gzip -9f $(tmp)$(doc)/sysv-rc/*
-	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
-#	gzip -9f $(tmp)/usr/share/man/??/man*/*.[0-9]
-#	gzip -9f $(tmp)/usr/share/man/??.*/man*/*.[0-9]
-	install -d -o root -g root -m 755 $(tmp)/usr/share/lintian/overrides
-	install -o root -g root -m 644 \
+		> $(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 \
-		$(tmp)/usr/share/lintian/overrides/sysv-rc
-	install -o root -g root -m 644 debian/sysv-rc.copyright \
-	  $(tmp)$(doc)/sysv-rc/copyright
-	install -d -o root -g root -m 755 $(tmp)/DEBIAN
-	po2debconf debian/sysv-rc.templates > $(tmp)/DEBIAN/templates
+		$(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 -o root -g root -m 755 debian/sysv-rc.$$f $(tmp)/DEBIAN/$$f ; \
+		$(INSTALL) debian/sysv-rc.$$f $(rctmp)/DEBIAN/$$f ; \
 	done
-	dpkg-gencontrol -psysv-rc -P$(tmp) -isp
-	dh_md5sums -Ninitscripts -Nsysv-rc
-	dpkg --build $(tmp) ..
-	rm -rf $(tmp)
+	dh_compress -psysv-rc
+	dh_gencontrol -psysv-rc
+	dh_md5sums -psysv-rc
+	dh_builddeb -psysv-rc
 
 clean:
 	dh_testdir
 	$(MAKE) -C src clobber
 	$(MAKE) -C debian/startpar clean
 	$(MAKE) -f debian/rules unpatch
-	dh_clean -Xdebian/initscripts -Xdebian/sysv-rc \
-		build-stamp debian/readlink
+	dh_clean build-stamp debian/readlink
 
 binary: binary-arch binary-indep
 

Modified: sysvinit/trunk/debian/src/initscripts/Makefile
===================================================================
--- sysvinit/trunk/debian/src/initscripts/Makefile	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/src/initscripts/Makefile	2009-09-07 16:52:08 UTC (rev 1735)
@@ -18,12 +18,15 @@
 	$(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)
 	$(INSTALL) -d $(DESTDIR)/usr/share/initscripts
 	cp -afv share/* $(DESTDIR)/usr/share/initscripts
+	find $(DESTDIR)/usr/share/initscripts -type d -name .svn -print0 |xargs -r0 rm -r
 
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/default
 	cp -afv etc/* $(DESTDIR)$(sysconfdir)
+	find $(DESTDIR)$(sysconfdir) -type d -name .svn -print0 |xargs -r0 rm -r
 
 	cp -afv lib/* $(DESTDIR)/lib
+	find $(DESTDIR)/lib -type d -name .svn  -print0 |xargs -r0 rm -r
 	chmod 755 $(DESTDIR)$(sysconfdir)/init.d/[a-z]*
 	chmod 755 $(DESTDIR)$(sysconfdir)/network/if-up.d/[a-z]*
 	chmod 644 $(DESTDIR)/lib/init/*.sh

Modified: sysvinit/trunk/debian/src/sysv-rc/Makefile
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/Makefile	2009-09-07 05:42:56 UTC (rev 1734)
+++ sysvinit/trunk/debian/src/sysv-rc/Makefile	2009-09-07 16:52:08 UTC (rev 1735)
@@ -15,6 +15,8 @@
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
 	$(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)/.
 	cp -af etc/* $(DESTDIR)$(sysconfdir)
+	find $(DESTDIR)$(sysconfdir) -type d -name .svn -print0 |xargs -r0 rm -r
+
 	for N in 2 3 4 5 ; do \
 		$(INSTALL) -d $(DESTDIR)$(sysconfdir)/rc$${N}.d ; \
 		$(INSTALL_DATA) rc2-5.d-README \

Added: sysvinit/trunk/debian/sysvinit-utils.dirs
===================================================================
--- sysvinit/trunk/debian/sysvinit-utils.dirs	                        (rev 0)
+++ sysvinit/trunk/debian/sysvinit-utils.dirs	2009-09-07 16:52:08 UTC (rev 1735)
@@ -0,0 +1,7 @@
+usr/share/doc/sysvinit-utils
+bin
+sbin
+usr/bin
+usr/sbin
+usr/share/man/man1
+usr/share/man/man8

Added: sysvinit/trunk/debian/sysvinit.dirs
===================================================================
--- sysvinit/trunk/debian/sysvinit.dirs	                        (rev 0)
+++ sysvinit/trunk/debian/sysvinit.dirs	2009-09-07 16:52:08 UTC (rev 1735)
@@ -0,0 +1,11 @@
+etc
+usr/share/sysvinit
+usr/include
+usr/share/doc/sysvinit
+bin
+sbin
+usr/bin
+usr/sbin
+usr/share/man/man1
+usr/share/man/man5
+usr/share/man/man8




More information about the Pkg-sysvinit-commits mailing list