Merge branch 'debian': Imported 3.0~b8-1 from Debian Live

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

diff --git a/debian/control b/debian/control
index 3450a50..9b10877 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Grml Team <team@grml.org>
 Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://live.debian.net/devel/live-boot/
 Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
 Vcs-Git: git://git.grml.org/live-boot-grml.git
@@ -12,15 +12,15 @@ Bugs: mailto:bugs@grml.org
 
 Package: live-boot-grml
 Architecture: all
-Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools
+Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
 Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime
 Conflicts: live-boot
 Replaces: live-boot
 Provides: live-boot
 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
- boot process (early userspace).
+Description: Live System Boot Scripts
+ live-boot contains the scripts that configure a live system during the boot
+ process (early userspace).
  .
  In addition to live-boot, a backend for the initrd generation is required, such
  as live-boot-initramfs-tools.
@@ -33,12 +33,11 @@ Package: live-boot-grml-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: live-boot (<< 3.0~a18~), live-boot-doc
-Replaces: live-boot, live-boot-doc
-Provides: live-boot-doc
-Description: Debian Live - System Boot Scripts (documentation)
- live-boot contains the scripts that configure a Debian Live system during the
- boot process (early userspace).
+Conflicts: live-boot (<< 3.0~a18~)
+Replaces: live-boot
+Description: Live System Boot Scripts (documentation)
+ live-boot contains the scripts that configure a live system during the boot
+ process (early userspace).
  .
  This package contains the documentation.
  .
@@ -53,10 +52,9 @@ Depends:
 Conflicts: live-boot-backend
 Replaces: live-boot-backend
 Provides: live-boot-backend
-Breaks: klibc-utils (<< 2.0-2)
-Description: Debian Live - System Boot Scripts (initramfs-tools backend)
- live-boot contains the scripts that configure a Debian Live system during the
- boot process (early userspace).
+Description: Live System Boot Scripts (initramfs-tools backend)
+ live-boot contains the scripts that configure a live system during the boot
+ process (early userspace).
  .
  This package contains the initramfs-tools backend.
  .