[SCM] live-boot branch, debian, updated. debian/3.0_a18-1-6-g70f23ec

[Daniel Baumann]

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

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

diff --git a/debian/control b/debian/control
index e335732..9068f4a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: git://live.debian.net/git/live-boot.git
 Package: live-boot
 Architecture: all
 Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend
-Recommends: eject, file, rsync, uuid-runtime
+Recommends: live-boot-doc, eject, file, rsync, uuid-runtime
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Debian Live - System Boot Scripts
  live-boot contains the scripts that configure a Debian Live system during the
@@ -21,6 +21,15 @@ Description: Debian Live - System Boot Scripts
  In addition to live-boot, a backend for the initrd generation is required, such
  as live-boot-initramfs-tools.
 
+Package: live-boot-doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Debian Live - System Boot Scripts (documentation)
+ live-boot contains the scripts that configure a Debian Live system during the
+ boot process (early userspace).
+ .
+ This package contains the documentation.
+
 Package: live-boot-initramfs-tools
 Architecture: all
 Depends:
diff --git a/debian/live-boot-doc.install b/debian/live-boot-doc.install
new file mode 100644
index 0000000..0e373be
--- /dev/null
+++ b/debian/live-boot-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc
+usr/share/man
diff --git a/debian/live-boot.install b/debian/live-boot.install
new file mode 100644
index 0000000..79474ce
--- /dev/null
+++ b/debian/live-boot.install
@@ -0,0 +1,2 @@
+sbin
+usr/share/live-boot
diff --git a/debian/rules b/debian/rules
index 455ed48..2720264 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,17 @@
 	dh ${@}
 
 override_dh_auto_install:
-	dh_auto_install -- DESTDIR=debian/live-boot
+	dh_auto_install -- DESTDIR=debian/tmp
 
 	# Removing useless files
-	rm -f debian/live-boot/usr/share/doc/live-boot/COPYING
+	rm -f debian/tmp/usr/share/doc/live-boot/COPYING
 
 	# live-boot-initramfs-tools
 	mkdir -p debian/live-boot-initramfs-tools/usr/share
-	mv debian/live-boot/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
+	mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 
 override_dh_installinit:
 	dh_installinit -p live-boot --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'
+
+override_dh_install:
+	dh_install --fail-missing

-- 
live-boot