Merge remote-tracking branch 'deb/debian' into debian

[live-boot-grml.git] / debian / control

diff --git a/debian/control b/debian/control
index 9068f4a..301b583 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,11 @@ Description: Debian Live - System Boot Scripts
  as live-boot-initramfs-tools.
 
 Package: live-boot-doc
+Section: 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).