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

[Petter Reinholdtsen]

Author: pere
Date: 2005-12-22 16:33:15 +0000 (Thu, 22 Dec 2005)
New Revision: 443

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/rules
Log:
  [ Petter Reinholdtsen ]
  * Reintroduce the $(doc) variable in debian/rules, to shorten lines and
    reduce the amount of changes since the last upload.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-22 14:48:29 UTC (rev 442)
+++ sysvinit/trunk/debian/changelog	2005-12-22 16:33:15 UTC (rev 443)
@@ -21,6 +21,10 @@
   * debian/rules, 30_strip.dpatch: Strip .comment section from executables
     (Closes: #343863)
 
+  [ Petter Reinholdtsen ]
+  * Reintroduce the $(doc) variable in debian/rules, to shorten lines and
+    reduce the amount of changes since the last upload.
+
  -- Thomas Hood <jdthood at yahoo.co.uk>  Sun, 18 Dec 2005 00:00:58 +0100
 
 sysvinit (2.86.ds1-7) experimental; urgency=low

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2005-12-22 14:48:29 UTC (rev 442)
+++ sysvinit/trunk/debian/rules	2005-12-22 16:33:15 UTC (rev 443)
@@ -4,6 +4,7 @@
 #
 
 tmp     = $(shell pwd)/debian/tmp
+doc	= /usr/share/doc
 
 SHELL	= /bin/bash
 LC_ALL	= POSIX
@@ -48,13 +49,13 @@
 	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)/var/log/fsck
-	install -d -g root -m 755 -o root $(tmp)/usr/share/doc/sysvinit
-	install -g root -m 644 doc/Changelog $(tmp)/usr/share/doc/sysvinit/changelog
+	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 \
-		$(tmp)/usr/share/doc/sysvinit/changelog.Debian
+		$(tmp)$(doc)/sysvinit/changelog.Debian
 	install -g root -m 644 debian/README.runlevels \
-		$(tmp)/usr/share/doc/sysvinit
-	gzip -9f $(tmp)/usr/share/doc/sysvinit/{README.runlevels,changelog*}
+		$(tmp)$(doc)/sysvinit
+	gzip -9f $(tmp)$(doc)/sysvinit/{README.runlevels,changelog*}
 	if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
 	then \
 		install -g root -m 644 -o root \
@@ -88,8 +89,8 @@
 	rm -f $(tmp)/bin/mountpoint
 	gzip -9f $(tmp)/usr/share/man/man*/*.[0-9]
 	install -g root -m 644 -o root debian/README \
-	  $(tmp)/usr/share/doc/sysvinit/copyright
-	cat COPYRIGHT >> $(tmp)/usr/share/doc/sysvinit/copyright
+	  $(tmp)$(doc)/sysvinit/copyright
+	cat COPYRIGHT >> $(tmp)$(doc)/sysvinit/copyright
 	install -g root -m 755 debian/postinst $(tmp)/DEBIAN/postinst
 #	make -C debian/startpar DESTDIR=$(tmp) install
 	dpkg-shlibdeps src/init # debian/startpar/startpar
@@ -108,12 +109,12 @@
 	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)/usr/share/doc/initscripts
-	install -g root -m 644 debian/initscripts/doc/* $(tmp)/usr/share/doc/initscripts
+	install -d -g root -m 755 -o root $(tmp)$(doc)/initscripts
+	install -g root -m 644 debian/initscripts/doc/* $(tmp)$(doc)/initscripts
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(tmp)/usr/share/doc/initscripts/changelog.Debian
-	chmod 644 $(tmp)/usr/share/doc/initscripts/changelog.Debian
-	gzip -9f $(tmp)/usr/share/doc/initscripts/*
+		> $(tmp)$(doc)/initscripts/changelog.Debian
+	chmod 644 $(tmp)$(doc)/initscripts/changelog.Debian
+	gzip -9f $(tmp)$(doc)/initscripts/*
 	cp -afv debian/initscripts/share/* $(tmp)/usr/share/initscripts
 	cp -afv debian/initscripts/etc/* $(tmp)/etc
 	cp -afv debian/initscripts/lib/* $(tmp)/lib
@@ -145,7 +146,7 @@
 		debian/initscripts/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/initscripts
 	install -g root -m 644 -o root debian/initscripts/copyright \
-	  $(tmp)/usr/share/doc/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 644 -o root debian/initscripts/conffiles \
@@ -166,12 +167,12 @@
 	-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)/usr/share/doc/sysv-rc
-	install -g root -m 644 debian/sysv-rc/doc/* $(tmp)/usr/share/doc/sysv-rc
+	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
 	sed -ne '/sysvinit (2.84-3)/q' -e p < debian/changelog \
-		> $(tmp)/usr/share/doc/sysv-rc/changelog.Debian
-	chmod 644 $(tmp)/usr/share/doc/sysv-rc/changelog.Debian
-	gzip -9f $(tmp)/usr/share/doc/sysv-rc/*
+		> $(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{0,1,2,3,4,5,6}.d
 	cp -af debian/sysv-rc/etc/* $(tmp)/etc
 	chmod 755 $(tmp)/etc/init.d/[a-z]*
@@ -201,7 +202,7 @@
 		debian/sysv-rc/lintian.overrides \
 		$(tmp)/usr/share/lintian/overrides/sysv-rc
 	install -g root -m 644 -o root debian/sysv-rc/copyright \
-	  $(tmp)/usr/share/doc/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
 	dpkg-gencontrol -psysv-rc -P$(tmp) -isp