[Pkg-sysvinit-commits] r1733 - in sysvinit/trunk/debian: . src/initscripts src/sysv-rc
Petter Reinholdtsen
pere at alioth.debian.org
Sun Sep 6 21:52:53 UTC 2009
Author: pere
Date: 2009-09-06 21:52:53 +0000 (Sun, 06 Sep 2009)
New Revision: 1733
Added:
sysvinit/trunk/debian/src/initscripts/Makefile
sysvinit/trunk/debian/src/sysv-rc/Makefile
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/rules
Log:
Move code installing files from sysv-rc and initscripts into those directories.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2009-09-06 20:42:39 UTC (rev 1732)
+++ sysvinit/trunk/debian/changelog 2009-09-06 21:52:53 UTC (rev 1733)
@@ -10,7 +10,9 @@
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/.
+ 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.
-- Petter Reinholdtsen <pere at debian.org> Sun, 06 Sep 2009 17:13:33 +0200
Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules 2009-09-06 20:42:39 UTC (rev 1732)
+++ sysvinit/trunk/debian/rules 2009-09-06 21:52:53 UTC (rev 1733)
@@ -208,48 +208,19 @@
# initscripts 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)/sbin
- install -d -o root -g root -m 755 $(tmp)/lib
- install -d -o root -g root -m 755 $(tmp)/etc
+ $(MAKE) -C debian/src/initscripts install DESTDIR=$(tmp)
+
ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
install -d -o root -g root -m 755 $(tmp)/sys
endif
- install -d -o root -g root -m 755 $(tmp)/lib/init
- install -d -o root -g root -m 755 $(tmp)/lib/init/rw
- install -d -o root -g root -m 755 $(tmp)/usr/share/initscripts
- install -d -o root -g root -m 755 $(tmp)/var/lib/initscripts
- install -d -o root -g root -m 755 $(tmp)/var/log/fsck
- install -d -o root -g root -m 755 $(tmp)$(doc)/initscripts
- install -o root -g root -m 644 debian/src/initscripts/doc/* $(tmp)$(doc)/initscripts
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/*
- cp -afv debian/src/initscripts/share/* $(tmp)/usr/share/initscripts
- cp -afv debian/src/initscripts/etc/* $(tmp)/etc
- cp -afv debian/src/initscripts/lib/* $(tmp)/lib
- chmod 755 $(tmp)/etc/init.d/[a-z]*
- chmod 755 $(tmp)/etc/network/if-up.d/[a-z]*
- chmod 644 $(tmp)/lib/init/*.sh
- chmod 644 $(tmp)/etc/init.d/skeleton
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)/etc/default
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
- install -d -o root -g root -m 755 $(tmp)/var/lib/urandom
- install -o root -g root -m 755 debian/src/initscripts/sbin/fsck.nfs \
- $(tmp)/sbin/fsck.nfs
- install -o root -g root -m 644 debian/src/initscripts/man/fsck.nfs.8 \
- $(tmp)/usr/share/man/man8/fsck.nfs.8
- install -o root -g root -m 644 debian/src/initscripts/man/halt.5 \
- $(tmp)/usr/share/man/man5/halt.5
- install -o root -g root -m 644 debian/src/initscripts/rcS.5 \
- $(tmp)/usr/share/man/man5
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
@@ -262,6 +233,7 @@
$(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
@@ -281,43 +253,13 @@
# sysv-rc package
#
-rm -rf $(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
- install -d -o root -g root -m 755 $(tmp)$(doc)/sysv-rc
- install -d -o root -g root -m 755 $(tmp)/usr/share/sysv-rc
+ $(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
- install -o root -g root -m 644 debian/src/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
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/*
- cp -af debian/src/sysv-rc/etc/* $(tmp)/etc
- for N in 2 3 4 5 ; do \
- install -d -o root -g root -m 755 $(tmp)/etc/rc$${N}.d ; \
- install -o root -g root -m 644 debian/src/sysv-rc/rc2-5.d-README \
- $(tmp)/etc/rc$${N}.d/README ; \
- done
- chmod 755 $(tmp)/etc/init.d/[a-z]*
- chmod 644 $(tmp)/etc/init.d/README
- chmod -R go=u-w $(tmp)/etc
- chown -R root:root $(tmp)/etc
- install -d -o root -g root -m 755 $(tmp)/usr/sbin
- install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
-# install -d -o root -g root -m 755 $(tmp)/usr/share/man/ja/man8
-# install -d -o root -g root -m 755 $(tmp)/usr/share/man/fr.UTF-8/man8
-# install -d -o root -g root -m 755 $(tmp)/usr/share/man/es/man8
- install -o root -g root -m 644 debian/src/sysv-rc/man8/*.8 \
- $(tmp)/usr/share/man/man8
-# install -o root -g root -m 644 debian/src/sysv-rc/man8/ja/*.8 \
-# $(tmp)/usr/share/man/ja/man8
-# install -o root -g root -m 644 debian/src/sysv-rc/man8/fr.UTF-8/*.8 \
-# $(tmp)/usr/share/man/fr.UTF-8/man8
-# install -o root -g root -m 644 debian/src/sysv-rc/man8/es/*.8 \
-# $(tmp)/usr/share/man/es/man8
- install -o root -g root -m 755 debian/src/sysv-rc/sbin/invoke-rc.d $(tmp)/usr/sbin
- install -o root -g root -m 755 debian/src/sysv-rc/sbin/update-rc.d $(tmp)/usr/sbin
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]
@@ -327,12 +269,11 @@
$(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
for f in preinst postinst prerm postrm ; do \
install -o root -g root -m 755 debian/sysv-rc.$$f $(tmp)/DEBIAN/$$f ; \
done
- install -o root -g root -m 755 debian/src/sysv-rc/saveconfig \
- $(tmp)/usr/share/sysv-rc/saveconfig
dpkg-gencontrol -psysv-rc -P$(tmp) -isp
dh_md5sums -Ninitscripts -Nsysv-rc
dpkg --build $(tmp) ..
Added: sysvinit/trunk/debian/src/initscripts/Makefile
===================================================================
--- sysvinit/trunk/debian/src/initscripts/Makefile (rev 0)
+++ sysvinit/trunk/debian/src/initscripts/Makefile 2009-09-06 21:52:53 UTC (rev 1733)
@@ -0,0 +1,43 @@
+DESTDIR =
+sysconfdir = /etc
+prefix = /usr
+docdir = $(prefix)/share/doc/initscripts
+sbindir = /sbin
+
+INSTALL = install -m755 -o root -g root
+INSTALL_DATA = install -m644 -o root -g root
+
+all:
+
+install:
+ $(INSTALL) -d $(DESTDIR)/lib/init/rw/.
+ $(INSTALL) -d $(DESTDIR)/var/lib/initscripts/.
+ $(INSTALL) -d $(DESTDIR)/var/lib/urandom/.
+ $(INSTALL) -d $(DESTDIR)/var/log/fsck/.
+ $(INSTALL) -d $(DESTDIR)$(docdir)/.
+ $(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)
+ $(INSTALL) -d $(DESTDIR)/usr/share/initscripts
+ cp -afv share/* $(DESTDIR)/usr/share/initscripts
+
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/default
+ cp -afv etc/* $(DESTDIR)$(sysconfdir)
+
+ cp -afv lib/* $(DESTDIR)/lib
+ chmod 755 $(DESTDIR)$(sysconfdir)/init.d/[a-z]*
+ chmod 755 $(DESTDIR)$(sysconfdir)/network/if-up.d/[a-z]*
+ chmod 644 $(DESTDIR)/lib/init/*.sh
+ chmod 644 $(DESTDIR)$(sysconfdir)/init.d/skeleton
+ chmod -R g-w $(DESTDIR)
+ chown -R root:root $(DESTDIR)
+
+ $(INSTALL) -d $(DESTDIR)$(sbindir)/.
+ $(INSTALL) sbin/fsck.nfs $(DESTDIR)$(sbindir)/fsck.nfs
+
+ $(INSTALL) -d $(DESTDIR)/usr/share/man/man8
+ $(INSTALL_DATA) man/fsck.nfs.8 \
+ $(DESTDIR)/usr/share/man/man8/fsck.nfs.8
+
+ $(INSTALL) -d $(DESTDIR)/usr/share/man/man5
+ $(INSTALL_DATA) man/halt.5 $(DESTDIR)/usr/share/man/man5/.
+ $(INSTALL_DATA) rcS.5 $(DESTDIR)/usr/share/man/man5/.
Added: sysvinit/trunk/debian/src/sysv-rc/Makefile
===================================================================
--- sysvinit/trunk/debian/src/sysv-rc/Makefile (rev 0)
+++ sysvinit/trunk/debian/src/sysv-rc/Makefile 2009-09-06 21:52:53 UTC (rev 1733)
@@ -0,0 +1,42 @@
+DESTDIR =
+sysconfdir = /etc
+prefix = /usr
+docdir = $(prefix)/share/doc/sysv-rc
+bindir = $(prefix)/bin
+sbindir = $(prefix)/sbin
+
+INSTALL = install -m755 -o root -g root
+INSTALL_DATA = install -m644 -o root -g root
+
+all:
+
+install:
+ $(INSTALL) -d $(DESTDIR)$(docdir)/.
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
+ $(INSTALL_DATA) doc/* $(DESTDIR)$(docdir)/.
+ cp -af etc/* $(DESTDIR)$(sysconfdir)
+ for N in 2 3 4 5 ; do \
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/rc$${N}.d ; \
+ $(INSTALL_DATA) rc2-5.d-README \
+ $(DESTDIR)$(sysconfdir)/rc$${N}.d/README ; \
+ done
+ chmod 755 $(DESTDIR)$(sysconfdir)/init.d/[a-z]*
+ chmod 644 $(DESTDIR)$(sysconfdir)/init.d/README
+ chmod -R go=u-w $(DESTDIR)$(sysconfdir)
+ chown -R root:root $(DESTDIR)$(sysconfdir)
+
+ $(INSTALL) -d $(DESTDIR)/usr/share/man/man8/.
+ $(INSTALL_DATA) man8/*.8 $(DESTDIR)/usr/share/man/man8
+# $(INSTALL) -d $(DESTDIR)/usr/share/man/ja/man8/.
+# $(INSTALL_DATA) man8/ja/*.8 $(DESTDIR)/usr/share/man/ja/man8
+# $(INSTALL) -d $(DESTDIR)/usr/share/man/fr.UTF-8/man8/.
+# $(INSTALL_DATA) man8/fr.UTF-8/*.8 $(DESTDIR)/usr/share/man/fr.UTF-8/man8
+# $(INSTALL) -d $(tmp)/usr/share/man/es/man8/.
+# $(INSTALL_DATA) man8/es/*.8 $(DESTDIR)/usr/share/man/es/man8
+
+ $(INSTALL) -d $(DESTDIR)$(sbindir)/.
+ $(INSTALL) sbin/invoke-rc.d $(DESTDIR)$(sbindir)
+ $(INSTALL) sbin/update-rc.d $(DESTDIR)$(sbindir)
+
+ $(INSTALL) -d $(DESTDIR)/usr/share/sysv-rc/.
+ $(INSTALL) saveconfig $(DESTDIR)/usr/share/sysv-rc/saveconfig
More information about the Pkg-sysvinit-commits
mailing list