[SCM] live-config branch, debian, updated. debian/3.0_a33-1-3-g0f356fd

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 0f3af5e5b178b134271fa63a1944977108e7f5df
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Mar 30 09:45:49 2012 +0200

    Removing runit backend, focusing in supporting the main init systems only (systemd, sysvinit, upstart), for the time being at least.

diff --git a/debian/control b/debian/control
index cc27dc6..4db7f0d 100644
--- a/debian/control
+++ b/debian/control
@@ -34,19 +34,6 @@ Description: Debian Live - System Configuration Scripts (documentation)
  .
  This package contains the documentation.
 
-Package: live-config-runit
-Architecture: all
-Depends: ${misc:Depends}
-Conflicts: live-config-backend
-Replaces: live-config-backend
-Provides: live-config-backend
-Suggests: runit-run
-Description: Debian Live - System Configuration Scripts (runit backend)
- live-config contains the scripts that configure a Debian Live system during
- the boot process (late userspace).
- .
- This package contains the runit backend (experimental!).
-
 Package: live-config-systemd
 Architecture: all
 Depends: ${misc:Depends}, systemd
diff --git a/debian/live-config-runit.live-config.init b/debian/live-config-runit.live-config.init
deleted file mode 100644
index 75a3eef..0000000
--- a/debian/live-config-runit.live-config.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-## live-config contains the scripts that configure a Debian Live system during
-## the boot process (late userspace).
-##
-## This is the runit-run script for live-config.
-
-
-### BEGIN INIT INFO
-# Provides:		live-config
-# Required-Start:
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start:	S
-# Default-Stop:
-# Short-Description:	Debian Live - System Configuration Scripts
-# Description:		live-config contains the scripts that configure a Debian
-#			Live system during the boot process (late userspace).
-# X-Start-Before:	mountkernfs
-# X-Stop-After:
-# X-Interactive:	true
-### END INIT INFO
-
-case "${1}" in
-	start)
-		if [ -e /lib/live/config.sh ]
-		then
-			/lib/live/config.sh
-		fi
-		;;
-
-	force-reload|restart|stop)
-
-		;;
-esac
diff --git a/debian/rules b/debian/rules
index f24a15c..5c75d8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,5 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_installinit:
-	dh_installinit -p live-config-runit --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 00 S .' --name live-config
 	dh_installinit -p live-config-upstart --no-restart-on-upgrade --no-start --name live-config
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index ebbc879..5df7df8 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,3 +1 @@
-live-config source: binaries-have-file-conflict live-config-runit live-config-sysvinit etc/init.d/live-config
-live-config source: binaries-have-file-conflict live-config-runit live-config-upstart etc/init.d/live-config
 live-config source: binaries-have-file-conflict live-config-sysvinit live-config-upstart etc/init.d/live-config

-- 
live-config