Merge remote-tracking branch 'upstream/master'

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

diff --git a/debian/control b/debian/control
index 54a98f6..ecffb52 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: live-boot
 Section: misc
 Priority: optional
 Maintainer: Grml Team <team@grml.org>
-Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
-Standards-Version: 3.9.6
+Build-Depends:
+ debhelper (>= 10),
+Standards-Version: 4.1.3
 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
@@ -13,9 +14,8 @@ Bugs: mailto:bugs@grml.org
 Package: live-boot-grml
 Architecture: all
 Depends:
- ${misc:Depends},
  live-boot-grml-initramfs-tools | live-boot-backend,
- genext2fs,
+ ${misc:Depends},
 Recommends:
  live-boot-grml-doc,
  live-tools,
@@ -24,8 +24,8 @@ Recommends:
  rsync,
  uuid-runtime,
 Suggests:
- curlftpfs,
  cryptsetup,
+ curlftpfs,
  httpfs2,
  wget,
 Conflicts: live-boot
@@ -33,7 +33,8 @@ Replaces: live-boot
 Provides: live-boot
 Description: Live System Boot Components
  live-boot contains the components to configure a live system during the boot
- process (early userspace).
+ process (early userspace). Do not install this package on your regular system,
+ it is only meant to be used in a live image.
  .
  In addition to live-boot, a backend for the initrd generation is required, such
  as live-boot-initramfs-tools.
@@ -45,7 +46,9 @@ Description: Live System Boot Components
 Package: live-boot-grml-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
 Description: Live System Boot Components (documentation)
  The Live Systems project maintains the components to build Debian based Live
  systems and the official Debian Live images themselves.
@@ -62,19 +65,23 @@ Description: Live System Boot Components (documentation)
 Package: live-boot-grml-initramfs-tools
 Architecture: all
 Depends:
- ${misc:Depends},
  busybox | busybox-initramfs,
  initramfs-tools,
  udev,
-Conflicts: live-boot-backend
-Replaces: live-boot-backend
-Provides: live-boot-backend
+ ${misc:Depends},
+Conflicts:
+ live-boot-backend,
+Replaces:
+ live-boot-backend,
+Provides:
+ live-boot-backend,
 Description: Live System Boot Components (initramfs-tools backend)
  The Live Systems project maintains the components to build Debian based Live
  systems and the official Debian Live images themselves.
  .
  live-boot contains the components to configure a live system during the boot
- process (early userspace).
+ process (early userspace). Do not install this package on your regular system,
+ it is only meant to be used in a live image.
  .
  This package contains the initramfs-tools backend.
  .