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

[Kel Modderman]

Author: kelmo-guest
Date: 2009-08-01 19:17:55 +0000 (Sat, 01 Aug 2009)
New Revision: 1582

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/rules
Log:
* Add insserv test suite script as debian/insserv-testsuite and execute it
  just before installing binary in package staging area.
* Remove checkdir, checkroot and buildfromsvn targets from debian/rules.
  The latter is unused by current maintainers and the former can be replaced
  with dh_testdir and dh_testroot instead.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-08-01 18:59:46 UTC (rev 1581)
+++ sysvinit/trunk/debian/changelog	2009-08-01 19:17:55 UTC (rev 1582)
@@ -39,16 +39,19 @@
   * Add insserv patches to debian/insserv/patches from insserv package
     revision 1.12.0-11. Add new patch 20_install_perms_fixup.patch to install
     binary and conffile with correct permissions.
+  * Add insserv test suite script as debian/insserv-testsuite and execute it
+    just before installing binary in package staging area.
   * Add debian/insserv/patches/21_tests_suite_new_functions.patch to add a
     couple of new test suite functions to upstream test suite.
   * Add /etc/insserv.conf to debian/sysv-rc/conffiles.
   * Call dpkg-shlibdeps debian/startpar/startpar for sysvinit-utils package
     and not sysvinit, startpar moved in revision 2.86.ds1-62.
+  * Remove checkdir, checkroot and buildfromsvn targets from debian/rules.
+    The latter is unused by current maintainers and the former can be replaced
+    with dh_testdir and dh_testroot instead.
 
-  *** XXX: ALL THE INSSERV PACKAGING NEEDS TO BE INTEGRATED ***
+ -- Kel Modderman <kel at otaku42.de>  Sun, 02 Aug 2009 05:16:46 +1000
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 02 Aug 2009 03:36:08 +1000
-
 sysvinit (2.87dsf-2) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-08-01 18:59:46 UTC (rev 1581)
+++ sysvinit/trunk/debian/rules	2009-08-01 19:17:55 UTC (rev 1582)
@@ -30,10 +30,6 @@
   endif
 endif
 
-define checkdir
-	test -f src/init.c
-endef
-
 PATCH_STAMP=debian/stamp-patched
 patch: $(PATCH_STAMP)
 $(PATCH_STAMP):
@@ -54,13 +50,9 @@
 		QUILT_PATCHES=patches quilt --quiltrc /dev/null pop -a -R || test $$? = 2
 	rm -rf .pc debian/startpar/.pc debian/insserv/.pc $(PATCH_STAMP)
 
-test:
-	chmod a+rx debian/insserv-testsuite
-	debian/insserv-testsuite
-
 build: patch
 # Builds the binary package.
-	$(checkdir)
+	dh_testdir
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	$(MAKE) -C src $(CROSS) DISTRO=Debian WITH_SELINUX="yes"
 else
@@ -72,7 +64,8 @@
 	touch build
 
 # Make a binary package (.deb file)
-binary-arch:	build checkroot test
+binary-arch:	build
+	dh_testroot
 	#
 	# sysvinit package
 	#
@@ -324,6 +317,11 @@
 		$(tmp)/usr/share/man/es/man8
 	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
+	#
+	# run insserv test suite to detect new/reported errors
+	#
+	chmod a+rx debian/insserv-testsuite
+	debian/insserv-testsuite
 	$(MAKE) $(CROSS) -C debian/insserv DESTDIR=$(tmp) install
 	strip -s -R comment -R .comment $(tmp)/sbin/insserv
 	install -d -o root -g root -m 755 $(tmp)/etc/insserv.conf.d
@@ -361,9 +359,11 @@
 	rm -rf $(tmp)
 
 # Architecture independant files.
-binary-indep:   build checkroot
+binary-indep:
+# We have nothing to do by default.
 
-clean:	checkroot
+clean:
+	dh_testdir
 	$(MAKE) -C src clobber
 	$(MAKE) -C debian/startpar clean
 	$(MAKE) -C debian/insserv clean
@@ -374,16 +374,4 @@
 
 binary: binary-arch binary-indep
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-buildfromsvn:
-	version=`dpkg-parsechangelog | grep Version: | awk '{print $$2}'`; \
-	rm -rf ../sysvinit-$$version; \
-	svn export . ../sysvinit-$$version; \
-	cp debian/changelog ../sysvinit-$$version/debian/changelog; \
-	chmod -R a-s ../sysvinit-$$version; \
-	(cd ../sysvinit-$$version && debuild $(DEBUILDFLAGS))
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean