[SCM] live-config branch, debian-next, updated. debian/3.0_a38-1-5-g68766ba

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 68766baa9e5c1ed6c5b73216b5da57d2f1f54a64
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 19:56:31 2012 +0200

    Re-arranging initsystem backends in source tree.

diff --git a/Makefile b/Makefile
index 9af1961..ae3d0c9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* scripts/*.sh scripts/*/*
+SCRIPTS = backends/*/*.init bin/* scripts/*.sh scripts/*/*
 
 all: build
 
@@ -48,6 +48,19 @@ build:
 	@echo "Nothing to build."
 
 install:
+	# Installing backends
+	mkdir -p $(DESTDIR)/etc/init.d
+	cp backends/sysvinit/live-config.init $(DESTDIR)/etc/init.d/live-config
+	cp backends/sysvinit/live.init $(DESTDIR)/etc/init.d/live
+
+	mkdir -p $(DESTDIR)/etc/init
+	cp backends/upstart/live-config.upstart $(DESTDIR)/etc/init/live-config.conf
+
+	mkdir -p $(DESTDIR)/etc/systemd/system
+	cp backends/systemd/live-config.systemd $(DESTDIR)/etc/systemd/system/live-config.service
+	mkdir -p $(DESTDIR)/etc/systemd/system/runlevel1.target.wants
+	ln -s ../live-config.service $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
+
 	# Installing scripts
 	mkdir -p $(DESTDIR)/lib/live
 	cp -r scripts/config.sh scripts/config $(DESTDIR)/lib/live
@@ -76,6 +89,22 @@ install:
 	done
 
 uninstall:
+	# Uininstalling backends
+	rm -f $(DESTDIR)/etc/init.d/live
+	rm -f $(DESTDIR)/etc/init.d/live-config
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init.d > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc > /dev/null 2>&1 || true
+
+	rm -f $(DESTDIR)/etc/init/live-config.conf
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/init > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc > /dev/null 2>&1 || true
+
+	rm -f $(DESTDIR)/etc/systemd/system/live-config.service
+	rm -f $(DESTDIR)/etc/systemd/system/runlevel1.target.wants/live-config.service
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system/runlevel1.target.wants > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd/system  > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/etc/systemd > /dev/null 2>&1 || true
+
 	# Uninstalling scripts
 	rm -f $(DESTDIR)/lib/live/boot-init.sh
 
diff --git a/debian/live-config-systemd.service b/backends/systemd/live-config.systemd
similarity index 100%
rename from debian/live-config-systemd.service
rename to backends/systemd/live-config.systemd
diff --git a/debian/live-config-sysvinit.live-config.init b/backends/sysvinit/live-config.init
old mode 100644
new mode 100755
similarity index 100%
rename from debian/live-config-sysvinit.live-config.init
rename to backends/sysvinit/live-config.init
diff --git a/debian/live-config-sysvinit.live.init b/backends/sysvinit/live.init
old mode 100644
new mode 100755
similarity index 100%
rename from debian/live-config-sysvinit.live.init
rename to backends/sysvinit/live.init
diff --git a/debian/live-config-upstart.live-config.upstart b/backends/upstart/live-config.upstart
similarity index 100%
rename from debian/live-config-upstart.live-config.upstart
rename to backends/upstart/live-config.upstart
diff --git a/debian/live-config-systemd.install b/debian/live-config-systemd.install
new file mode 100644
index 0000000..70c5ece
--- /dev/null
+++ b/debian/live-config-systemd.install
@@ -0,0 +1 @@
+etc/systemd
diff --git a/debian/live-config-sysvinit.install b/debian/live-config-sysvinit.install
new file mode 100644
index 0000000..4932586
--- /dev/null
+++ b/debian/live-config-sysvinit.install
@@ -0,0 +1 @@
+etc/init.d
diff --git a/debian/live-config-upstart.install b/debian/live-config-upstart.install
new file mode 100644
index 0000000..a7d915d
--- /dev/null
+++ b/debian/live-config-upstart.install
@@ -0,0 +1 @@
+etc/init
diff --git a/debian/rules b/debian/rules
index 40d83a2..1c658fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,6 @@
 override_dh_auto_install:
 	dh_auto_install -- DESTDIR=debian/tmp
 
-	# live-config-systemd
-	install -D -m 0644 debian/live-config-systemd.service debian/live-config-systemd/etc/systemd/system/live-config.service
-	mkdir -p debian/live-config-systemd/etc/systemd/system/runlevel1.target.wants
-	ln -s ../live-config.service debian/live-config-systemd/etc/systemd/system/runlevel1.target.wants/live-config.service
-
 	# live-config-sysvinit
 	mkdir -p debian/live-config-sysvinit/lib/live/config
 	mv debian/tmp/lib/live/config/*-sysvinit debian/live-config-sysvinit/lib/live/config
@@ -34,7 +29,7 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_installinit:
-	dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config
-	dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .' --name live
+	dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 00 S .' --name live-config --onlyscripts
+	dh_installinit -p live-config-sysvinit --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .' --name live --onlyscripts
 
-	dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config
+	dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config --onlyscripts

-- 
live-config