[SCM] live-config branch, debian, updated. debian/3.0_a22-1-3-g14d067e

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit d0a9c7659c5a452c9934b3de0bd5f53fe4993e44
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 13 03:18:39 2011 +0200

    Splitting out documentation so that it can be accesses separately from the initsystem code.

diff --git a/debian/control b/debian/control
index 5ea2f23..3745091 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://live.debian.net/git/live-config.git
 Package: live-config
 Architecture: all
 Depends: ${misc:Depends}, live-config-sysvinit | live-config-backend
-Recommends: live-tools, user-setup, sudo
+Recommends: live-config-doc, live-tools, user-setup, sudo
 Suggests: wget
 Description: Debian Live - System Configuration Scripts
  live-config contains the scripts that configure a Debian Live system during
@@ -22,6 +22,17 @@ Description: Debian Live - System Configuration Scripts
  In addition to live-config, a backend for an init system is required, such as
  live-config-sysvinit.
 
+Package: live-config-doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: live-config (<< 3.0~a22~)
+Replaces: live-config
+Description: Debian Live - System Configuration Scripts (documentation)
+ live-config contains the scripts that configure a Debian Live system during
+ the boot process (late userspace).
+ .
+ This package contains the documentation.
+
 Package: live-config-runit
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/live-config-doc.install b/debian/live-config-doc.install
new file mode 100644
index 0000000..0e373be
--- /dev/null
+++ b/debian/live-config-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc
+usr/share/man
diff --git a/debian/live-config.install b/debian/live-config.install
new file mode 100644
index 0000000..0c01afe
--- /dev/null
+++ b/debian/live-config.install
@@ -0,0 +1,2 @@
+lib
+var
diff --git a/debian/rules b/debian/rules
index ebf8631..aeb385b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,7 @@
 	dh ${@}
 
 override_dh_auto_install:
-	dh_auto_install -- DESTDIR=debian/live-config
-
-	# Removing unused files
-	rm -f debian/live-config/usr/share/doc/live-config/COPYING
-	bin/live-config-update debian/live-config/lib/live/config
+	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
@@ -17,17 +13,24 @@ override_dh_auto_install:
 
 	# live-config-sysvinit
 	mkdir -p debian/live-config-sysvinit/lib/live/config
-	mv debian/live-config/lib/live/config/*-sysvinit debian/live-config-sysvinit/lib/live/config
-	mv debian/live-config/lib/live/config/*-sysv-rc debian/live-config-sysvinit/lib/live/config
+	mv debian/tmp/lib/live/config/*-sysvinit debian/live-config-sysvinit/lib/live/config
+	mv debian/tmp/lib/live/config/*-sysv-rc debian/live-config-sysvinit/lib/live/config
 
 	# live-config-upstart
 	mkdir -p debian/live-config-upstart/lib/live/config
-	mv debian/live-config/lib/live/config/*-upstart debian/live-config-upstart/lib/live/config
+	mv debian/tmp/lib/live/config/*-upstart debian/live-config-upstart/lib/live/config
+
+	# Removing unused files
+	rm -f debian/tmp/usr/share/doc/live-config/COPYING
+	bin/live-config-update debian/tmp/lib/live/config
 
 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
 
+override_dh_install:
+	dh_install --fail-missing
+
 override_dh_compress:
 	dh_compress -Xusr/share/doc/live-config/examples

-- 
live-config