[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 669d29f3bf0313ae02b971a7dea84ad4eada2bfb
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 13 03:26:23 2011 +0200

    Adding conflicts/replaces for live-boot to live-boot-doc to not break upgrades.

diff --git a/debian/control b/debian/control
index 9068f4a..f574af7 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Description: Debian Live - System Boot Scripts
 Package: live-boot-doc
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: live-boot (<< 3.0~a18~)
+Replaces: live-boot
 Description: Debian Live - System Boot Scripts (documentation)
  live-boot contains the scripts that configure a Debian Live system during the
  boot process (early userspace).

-- 
live-boot